vfs, fdtable: Prevent bounds-check bypass via speculative execution

[pandora-kernel.git] / include / linux / inet_lro.h

diff --git a/include/linux/inet_lro.h b/include/linux/inet_lro.h
index c4335fa..2cf55af 100644 (file)
--- a/include/linux/inet_lro.h
+++ b/include/linux/inet_lro.h
@@ -50,7 +50,6 @@ struct net_lro_desc {
        struct skb_frag_struct *next_frag;
        struct iphdr *iph;
        struct tcphdr *tcph;
-       struct vlan_group *vgrp;
        __wsum  data_csum;
        __be32 tcp_rcv_tsecr;
        __be32 tcp_rcv_tsval;
@@ -60,7 +59,6 @@ struct net_lro_desc {
        u16 ip_tot_len;
        u16 tcp_saw_tstamp;             /* timestamps enabled */
        __be16 tcp_window;
-       u16 vlan_tag;
        int pkt_aggr_cnt;               /* counts aggregated packets */
        int vlan_packet;
        int mss;
@@ -136,16 +134,6 @@ void lro_receive_skb(struct net_lro_mgr *lro_mgr,
                     struct sk_buff *skb,
                     void *priv);
 
-/*
- * Processes a SKB with VLAN HW acceleration support
- */
-
-void lro_vlan_hwaccel_receive_skb(struct net_lro_mgr *lro_mgr,
-                                 struct sk_buff *skb,
-                                 struct vlan_group *vgrp,
-                                 u16 vlan_tag,
-                                 void *priv);
-
 /*
  * Processes a fragment list
  *
@@ -165,13 +153,6 @@ void lro_receive_frags(struct net_lro_mgr *lro_mgr,
                       struct skb_frag_struct *frags,
                       int len, int true_size, void *priv, __wsum sum);
 
-void lro_vlan_hwaccel_receive_frags(struct net_lro_mgr *lro_mgr,
-                                   struct skb_frag_struct *frags,
-                                   int len, int true_size,
-                                   struct vlan_group *vgrp,
-                                   u16 vlan_tag,
-                                   void *priv, __wsum sum);
-
 /*
  * Forward all aggregated SKBs held by lro_mgr to network stack
  */