aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-03-25 22:43:59 -0400
committerDavid S. Miller <davem@davemloft.net>2008-03-25 22:43:59 -0400
commitdfe98e9214ced45cd1a6ecd19f2627819a630f77 (patch)
tree4a229937bc32c470ebb75a51bdd39572d91ac0ce /net/wireless
parentf89e6e3834035c6e8203042f3527931aa7f52496 (diff)
parent878628fbf2589eb24357e42027d5f54b1dafd3c8 (diff)
Merge branch 'net-2.6.26-netns-20080326' of git://git.linux-ipv6.org/gitroot/yoshfuji/linux-2.6-dev
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/wext.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/wext.c b/net/wireless/wext.c
index 2c569b63e7d8..947188a5b937 100644
--- a/net/wireless/wext.c
+++ b/net/wireless/wext.c
@@ -1157,7 +1157,7 @@ static void rtmsg_iwinfo(struct net_device *dev, char *event, int event_len)
1157 struct sk_buff *skb; 1157 struct sk_buff *skb;
1158 int err; 1158 int err;
1159 1159
1160 if (dev->nd_net != &init_net) 1160 if (dev_net(dev) != &init_net)
1161 return; 1161 return;
1162 1162
1163 skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC); 1163 skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);