| Message ID | 1364663257-14717-1-git-send-email-ordex@autistici.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Antonio Quartulli <ordex@autistici.org> Date: Sat, 30 Mar 2013 18:07:37 +0100 > iflink is currently set to 0 in __gre_tunnel_init(). This > function is invoked in gre_tap_init() and > ipgre_tunnel_init() which are both used to initialise the > ndo_init field of the respective net_device_ops structs > (ipgre.. and gre_tap..) used by GRE interfaces. > > However, in netdevice_register() iflink is first set to -1, > then ndo_init is invoked and then iflink is assigned to a > proper value if and only if it still was -1. > > Assigning 0 to iflink in ndo_init is therefore first > preventing netdev_register() to correctly assign it a proper > value and then breaking iflink at all since 0 has not > correct meaning. > > Fix this by removing the iflink assignment in > __gre_tunnel_init(). > > Introduced by c54419321455631079c7d6e60bc732dd0c5914c5 > ("GRE: Refactor GRE tunneling code.") > > Reported-by: Fengguang Wu <fengguang.wu@intel.com> > Signed-off-by: Antonio Quartulli <ordex@autistici.org> Please always indicate, in the subject line inside of the [] brackets, what tree the patch is targetted at. I can use "git describe" on the guilty commit, but why take a chance? Applied to net-next, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index ad662e9..e5dfd28 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -660,7 +660,6 @@ static void __gre_tunnel_init(struct net_device *dev) dev->needed_headroom = LL_MAX_HEADER + sizeof(struct iphdr) + 4; dev->mtu = ETH_DATA_LEN - sizeof(struct iphdr) - 4; - dev->iflink = 0; dev->features |= NETIF_F_NETNS_LOCAL | GRE_FEATURES; dev->hw_features |= GRE_FEATURES;
iflink is currently set to 0 in __gre_tunnel_init(). This function is invoked in gre_tap_init() and ipgre_tunnel_init() which are both used to initialise the ndo_init field of the respective net_device_ops structs (ipgre.. and gre_tap..) used by GRE interfaces. However, in netdevice_register() iflink is first set to -1, then ndo_init is invoked and then iflink is assigned to a proper value if and only if it still was -1. Assigning 0 to iflink in ndo_init is therefore first preventing netdev_register() to correctly assign it a proper value and then breaking iflink at all since 0 has not correct meaning. Fix this by removing the iflink assignment in __gre_tunnel_init(). Introduced by c54419321455631079c7d6e60bc732dd0c5914c5 ("GRE: Refactor GRE tunneling code.") Reported-by: Fengguang Wu <fengguang.wu@intel.com> Cc: Pravin B Shelar <pshelar@nicira.com> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Antonio Quartulli <ordex@autistici.org> --- net/ipv4/ip_gre.c | 1 - 1 file changed, 1 deletion(-)