refresh the packet socket patch for 2.6.29
authorFelix Fietkau <nbd@openwrt.org>
Thu, 30 Apr 2009 14:11:39 +0000 (14:11 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Thu, 30 Apr 2009 14:11:39 +0000 (14:11 +0000)
SVN-Revision: 15511

target/linux/generic-2.6/patches-2.6.29/240-packet_socket_type.patch

index 720d3201f3357144a6739872c811b92110d437cc..e2840ea6b9f220236f8b6fff4c52d16cb2e72490 100644 (file)
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        if (dev_net(dev) != sock_net(sk))
                goto drop;
  
-@@ -1072,6 +1075,7 @@ static int packet_create(struct net *net
+@@ -1073,6 +1076,7 @@ static int packet_create(struct net *net
        spin_lock_init(&po->bind_lock);
        mutex_init(&po->pg_vec_lock);
        po->prot_hook.func = packet_rcv;
@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
        if (sock->type == SOCK_PACKET)
                po->prot_hook.func = packet_rcv_spkt;
-@@ -1411,6 +1415,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -1413,6 +1417,16 @@ packet_setsockopt(struct socket *sock, i
                        ret = packet_mc_drop(sk, &mreq);
                return ret;
        }
@@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
  #ifdef CONFIG_PACKET_MMAP
        case PACKET_RX_RING:
-@@ -1542,6 +1556,13 @@ static int packet_getsockopt(struct sock
+@@ -1544,6 +1558,13 @@ static int packet_getsockopt(struct sock
  
                data = &val;
                break;