diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2012-01-31 15:13:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-31 15:13:14 +0100 |
| commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
| tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /drivers/net/xen-netback/interface.c | |
| parent | ALSA: HDA: Remove quirk for Toshiba Qosmio G50 (diff) | |
| parent | Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into fix/asoc (diff) | |
| download | linux-dev-ea51e5040e24eefe44d70bc654a237ca1f0225b0.tar.xz linux-dev-ea51e5040e24eefe44d70bc654a237ca1f0225b0.zip | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'drivers/net/xen-netback/interface.c')
| -rw-r--r-- | drivers/net/xen-netback/interface.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index 182562952c79..b7d41f8c338a 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -165,7 +165,8 @@ static int xenvif_change_mtu(struct net_device *dev, int mtu) return 0; } -static u32 xenvif_fix_features(struct net_device *dev, u32 features) +static netdev_features_t xenvif_fix_features(struct net_device *dev, + netdev_features_t features) { struct xenvif *vif = netdev_priv(dev); @@ -222,7 +223,7 @@ static void xenvif_get_strings(struct net_device *dev, u32 stringset, u8 * data) } } -static struct ethtool_ops xenvif_ethtool_ops = { +static const struct ethtool_ops xenvif_ethtool_ops = { .get_link = ethtool_op_get_link, .get_sset_count = xenvif_get_sset_count, @@ -230,7 +231,7 @@ static struct ethtool_ops xenvif_ethtool_ops = { .get_strings = xenvif_get_strings, }; -static struct net_device_ops xenvif_netdev_ops = { +static const struct net_device_ops xenvif_netdev_ops = { .ndo_start_xmit = xenvif_start_xmit, .ndo_get_stats = xenvif_get_stats, .ndo_open = xenvif_open, |