ar71xx/image: migrate tl-wr841nd-v1.5 to new build step using squashfs+jffs2 instead...

[oweals/openwrt.git] / target / linux / generic / patches-4.0 / 630-packet_socket_type.patch

diff --git a/target/linux/generic/patches-4.0/630-packet_socket_type.patch b/target/linux/generic/patches-4.0/630-packet_socket_type.patch
index 8c5711ba7a04012dae16006907ecca5f8eec365f..3a39f2a7e3bf2c92d11f10d786fe2e755c9dde54 100644 (file)
--- a/target/linux/generic/patches-4.0/630-packet_socket_type.patch
+++ b/target/linux/generic/patches-4.0/630-packet_socket_type.patch
@@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  #define PACKET_FANOUT_LB              1
 --- a/net/packet/af_packet.c
 +++ b/net/packet/af_packet.c
-@@ -1541,6 +1541,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -1527,6 +1527,7 @@ static int packet_rcv_spkt(struct sk_buf
  {
        struct sock *sk;
        struct sockaddr_pkt *spkt;
@@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
        /*
         *      When we registered the protocol we saved the socket in the data
-@@ -1548,6 +1549,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -1534,6 +1535,7 @@ static int packet_rcv_spkt(struct sk_buf
         */
  
        sk = pt->af_packet_priv;
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
        /*
         *      Yank back the headers [hope the device set this
-@@ -1560,7 +1562,7 @@ static int packet_rcv_spkt(struct sk_buf
+@@ -1546,7 +1548,7 @@ static int packet_rcv_spkt(struct sk_buf
         *      so that this procedure is noop.
         */
  
@@ -51,7 +51,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
                goto out;
  
        if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -1767,12 +1769,12 @@ static int packet_rcv(struct sk_buff *sk
+@@ -1753,12 +1755,12 @@ static int packet_rcv(struct sk_buff *sk
        int skb_len = skb->len;
        unsigned int snaplen, res;
  
@@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        if (!net_eq(dev_net(dev), sock_net(sk)))
                goto drop;
  
-@@ -1892,12 +1894,12 @@ static int tpacket_rcv(struct sk_buff *s
+@@ -1878,12 +1880,12 @@ static int tpacket_rcv(struct sk_buff *s
        BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
        BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
  
@@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        if (!net_eq(dev_net(dev), sock_net(sk)))
                goto drop;
  
-@@ -2853,6 +2855,7 @@ static int packet_create(struct net *net
+@@ -2839,6 +2841,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;
@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
  
        if (sock->type == SOCK_PACKET)
                po->prot_hook.func = packet_rcv_spkt;
-@@ -3442,6 +3445,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3428,6 +3431,16 @@ packet_setsockopt(struct socket *sock, i
                po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
                return 0;
        }
@@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
        default:
                return -ENOPROTOOPT;
        }
-@@ -3493,6 +3506,13 @@ static int packet_getsockopt(struct sock
+@@ -3479,6 +3492,13 @@ static int packet_getsockopt(struct sock
        case PACKET_VNET_HDR:
                val = po->has_vnet_hdr;
                break;