aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2015-04-02 17:07:09 +0200
committerDavid S. Miller <davem@davemloft.net>2015-04-02 14:05:01 -0400
commit7a66bbc96ce9ad8261fa5f7f6ae65370eb6866ee (patch)
tree84381863d07f36878b5b382f40d6dd2ab9c6bfb8 /include/linux/netdevice.h
parentdsa: implement ndo_get_iflink (diff)
downloadlinux-dev-7a66bbc96ce9ad8261fa5f7f6ae65370eb6866ee.tar.xz
linux-dev-7a66bbc96ce9ad8261fa5f7f6ae65370eb6866ee.zip
net: remove iflink field from struct net_device
Now that all users of iflink have the ndo_get_iflink handler available, it's possible to remove this field. By default, dev_get_iflink() returns the ifindex of the interface. Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 788eb7a622ad..846a1f5bc9db 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1538,7 +1538,7 @@ struct net_device {
netdev_features_t mpls_features;
int ifindex;
- int iflink;
+ int group;
struct net_device_stats stats;
@@ -1741,7 +1741,6 @@ struct net_device {
#endif
struct phy_device *phydev;
struct lock_class_key *qdisc_tx_busylock;
- int group;
struct pm_qos_request pm_qos_req;
};
#define to_net_dev(d) container_of(d, struct net_device, dev)