diff options
| author |   Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2015-04-07 12:10:16 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-04-07 17:30:45 -0400 |
| commit | 388069d30240e9524ad69ce6cc692fff2a5a7829 (patch) | |
| tree | 73cc94245c8109ceeb27e7f024d55ae7d7597fa3 /include/linux/netdevice.h | |
| parent | Merge branch 'netns-next' (diff) | |
| download | linux-dev-388069d30240e9524ad69ce6cc692fff2a5a7829.tar.xz linux-dev-388069d30240e9524ad69ce6cc692fff2a5a7829.zip | |
netdevice.h: remove iflink description
Also move 'group' description to match the order of the net_device structure.
Fixes: 7a66bbc96ce9 ("net: remove iflink field from struct net_device")
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | include/linux/netdevice.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 45823db2efb0..bf6d9df34d7b 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1328,7 +1328,7 @@ enum netdev_priv_flags { * @mpls_features: Mask of features inheritable by MPLS * * @ifindex: interface index - * @iflink: unique device identifier + * @group: The group, that the device belongs to * * @stats: Statistics struct, which was left as a legacy, use * rtnl_link_stats64 instead @@ -1488,7 +1488,6 @@ enum netdev_priv_flags { * * @qdisc_tx_busylock: XXX: need comments on this one * - * @group: The group, that the device belongs to * @pm_qos_req: Power Management QoS object * * FIXME: cleanup struct net_device such that network protocol info |