X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=inline;f=net%2Fbridge%2Fbr_netlink.c;h=f155e6ce8a215de9a8172443348bc13c6732cec2;hb=a811d91ab820a31f65ce83b9d335ec2011bda1cd;hp=f5d69336d97b037eff3e912cd3e596b639e0ef0c;hpb=0ba6c33bcddc64a54b5f1c25a696c4767dc76292;p=linux-2.6-omap-h63xx.git

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index f5d69336d97..f155e6ce8a2 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -108,7 +108,7 @@ errout:
  */
 static int br_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
 {
-	struct net *net = skb->sk->sk_net;
+	struct net *net = sock_net(skb->sk);
 	struct net_device *dev;
 	int idx;
 
@@ -140,7 +140,7 @@ skip:
  */
 static int br_rtm_setlink(struct sk_buff *skb,  struct nlmsghdr *nlh, void *arg)
 {
-	struct net *net = skb->sk->sk_net;
+	struct net *net = sock_net(skb->sk);
 	struct ifinfomsg *ifm;
 	struct nlattr *protinfo;
 	struct net_device *dev;