rpms/kernel/F-9 linux-2.6-wireless-fixups.patch,1.6,1.7

[John W. Linville (linville)]

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29258

Modified Files:
	linux-2.6-wireless-fixups.patch 
Log Message:
attempt to fix build problem that made koji choke

linux-2.6-wireless-fixups.patch:

Index: linux-2.6-wireless-fixups.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-wireless-fixups.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- linux-2.6-wireless-fixups.patch	1 Jul 2008 18:42:13 -0000	1.6
+++ linux-2.6-wireless-fixups.patch	1 Jul 2008 19:35:04 -0000	1.7
@@ -1063,3 +1063,15 @@
  		return;
  
  	skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
+diff -up linux-2.6.25.noarch/net/socket.c.orig linux-2.6.25.noarch/net/socket.c
+--- linux-2.6.25.noarch/net/socket.c.orig	2008-04-16 22:49:44.000000000 -0400
++++ linux-2.6.25.noarch/net/socket.c	2008-06-30 14:05:20.000000000 -0400
+@@ -2215,7 +2215,7 @@ static long compat_sock_ioctl(struct fil
+ 	struct net *net;
+ 
+ 	sk = sock->sk;
+-	net = sock_net(sk);
++	net = sk->sk_net;
+ 
+ 	if (sock->ops->compat_ioctl)
+ 		ret = sock->ops->compat_ioctl(sock, cmd, arg);