diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-10-17 12:11:08 (GMT) |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-10-17 12:28:03 (GMT) |
| commit | f0a0a978b66fea782a52b0a7075b3fa9ab27ad0a (patch) | |
| tree | 52ecc0eafbac697c6afaa542efe324984484120c /drivers/net/usb/sr9800.c | |
| parent | c8d71d08aa23679f56e7072358383442c6ede352 (diff) | |
| parent | 4be3158abe1e02d24f82b34101e41d662fae2185 (diff) | |
| download | linux-f0a0a978b66fea782a52b0a7075b3fa9ab27ad0a.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
This merge resolves conflicts with 75aec9df3a78 ("bridge: Remove
br_nf_push_frag_xmit_sk") as part of Eric Biederman's effort to improve
netns support in the network stack that reached upstream via David's
net-next tree.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Conflicts:
net/bridge/br_netfilter_hooks.c
Diffstat (limited to 'drivers/net/usb/sr9800.c')
| -rw-r--r-- | drivers/net/usb/sr9800.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c index 953de13..a50df0d 100644 --- a/drivers/net/usb/sr9800.c +++ b/drivers/net/usb/sr9800.c @@ -470,14 +470,10 @@ static int sr_get_eeprom(struct net_device *net, static void sr_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info) { - struct usbnet *dev = netdev_priv(net); - struct sr_data *data = (struct sr_data *)&dev->data; - /* Inherit standard device info */ usbnet_get_drvinfo(net, info); strncpy(info->driver, DRIVER_NAME, sizeof(info->driver)); strncpy(info->version, DRIVER_VERSION, sizeof(info->version)); - info->eedump_len = data->eeprom_len; } static u32 sr_get_link(struct net_device *net) |