kernel: remove linux 3.10 support

[openwrt/svn-archive/archive.git] / target / linux / generic / patches-3.10 / 630-packet_socket_type.patch

diff --git a/target/linux/generic/patches-3.10/630-packet_socket_type.patch b/target/linux/generic/patches-3.10/630-packet_socket_type.patch
deleted file mode 100644 (file)
index 88ede89..0000000
--- a/target/linux/generic/patches-3.10/630-packet_socket_type.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-This patch allows the user to specify desired packet types (outgoing,
-broadcast, unicast, etc.) on packet sockets via setsockopt.
-This can reduce the load in situations where only a limited number
-of packet types are necessary
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
---- a/include/uapi/linux/if_packet.h
-+++ b/include/uapi/linux/if_packet.h
-@@ -29,6 +29,8 @@ struct sockaddr_ll {
- /* These ones are invisible by user level */
- #define PACKET_LOOPBACK               5               /* MC/BRD frame looped back */
- #define PACKET_FASTROUTE      6               /* Fastrouted frame     */
-+#define PACKET_MASK_ANY               0xffffffff      /* mask for packet type bits */
-+
- 
- /* Packet socket options */
- 
-@@ -51,6 +53,7 @@ struct sockaddr_ll {
- #define PACKET_TIMESTAMP              17
- #define PACKET_FANOUT                 18
- #define PACKET_TX_HAS_OFF             19
-+#define PACKET_RECV_TYPE              20
- 
- #define PACKET_FANOUT_HASH            0
- #define PACKET_FANOUT_LB              1
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -1404,6 +1404,7 @@ static int packet_rcv_spkt(struct sk_buf
- {
-       struct sock *sk;
-       struct sockaddr_pkt *spkt;
-+      struct packet_sock *po;
- 
-       /*
-        *      When we registered the protocol we saved the socket in the data
-@@ -1411,6 +1412,7 @@ static int packet_rcv_spkt(struct sk_buf
-        */
- 
-       sk = pt->af_packet_priv;
-+      po = pkt_sk(sk);
- 
-       /*
-        *      Yank back the headers [hope the device set this
-@@ -1423,7 +1425,7 @@ static int packet_rcv_spkt(struct sk_buf
-        *      so that this procedure is noop.
-        */
- 
--      if (skb->pkt_type == PACKET_LOOPBACK)
-+      if (!(po->pkt_type & (1 << skb->pkt_type)))
-               goto out;
- 
-       if (!net_eq(dev_net(dev), sock_net(sk)))
-@@ -1630,12 +1632,12 @@ static int packet_rcv(struct sk_buff *sk
-       int skb_len = skb->len;
-       unsigned int snaplen, res;
- 
--      if (skb->pkt_type == PACKET_LOOPBACK)
--              goto drop;
--
-       sk = pt->af_packet_priv;
-       po = pkt_sk(sk);
- 
-+      if (!(po->pkt_type & (1 << skb->pkt_type)))
-+              goto drop;
-+
-       if (!net_eq(dev_net(dev), sock_net(sk)))
-               goto drop;
- 
-@@ -1748,12 +1750,12 @@ static int tpacket_rcv(struct sk_buff *s
-       struct timespec ts;
-       __u32 ts_status;
- 
--      if (skb->pkt_type == PACKET_LOOPBACK)
--              goto drop;
--
-       sk = pt->af_packet_priv;
-       po = pkt_sk(sk);
- 
-+      if (!(po->pkt_type & (1 << skb->pkt_type)))
-+              goto drop;
-+
-       if (!net_eq(dev_net(dev), sock_net(sk)))
-               goto drop;
- 
-@@ -2654,6 +2656,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;
-+      po->pkt_type = PACKET_MASK_ANY & ~(1 << PACKET_LOOPBACK);
- 
-       if (sock->type == SOCK_PACKET)
-               po->prot_hook.func = packet_rcv_spkt;
-@@ -3264,6 +3267,16 @@ packet_setsockopt(struct socket *sock, i
-               po->tp_tx_has_off = !!val;
-               return 0;
-       }
-+        case PACKET_RECV_TYPE:
-+        {
-+                unsigned int val;
-+                if (optlen != sizeof(val))
-+                        return -EINVAL;
-+                if (copy_from_user(&val, optval, sizeof(val)))
-+                        return -EFAULT;
-+                po->pkt_type = val & ~BIT(PACKET_LOOPBACK);
-+                return 0;
-+        }
-       default:
-               return -ENOPROTOOPT;
-       }
-@@ -3315,6 +3328,13 @@ static int packet_getsockopt(struct sock
-       case PACKET_VNET_HDR:
-               val = po->has_vnet_hdr;
-               break;
-+      case PACKET_RECV_TYPE:
-+              if (len > sizeof(unsigned int))
-+                      len = sizeof(unsigned int);
-+              val = po->pkt_type;
-+
-+              data = &val;
-+              break;
-       case PACKET_VERSION:
-               val = po->tp_version;
-               break;
---- a/net/packet/internal.h
-+++ b/net/packet/internal.h
-@@ -116,6 +116,7 @@ struct packet_sock {
-       unsigned int            tp_tstamp;
-       struct net_device __rcu *cached_dev;
-       struct packet_type      prot_hook ____cacheline_aligned_in_smp;
-+      unsigned int            pkt_type;
- };
- 
- static struct packet_sock *pkt_sk(struct sock *sk)