30 files changed, 73 insertions, 288 deletions

diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index af8cf3d7c1e3..0fc06d363806 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1214,8 +1214,8 @@ int be_cmd_get_reg_len(struct be_adapter *adapter, u32 *log_size)
         if (!status) {
                 struct be_cmd_resp_get_fat *resp = embedded_payload(wrb);
                 if (log_size && resp->log_size)
-                        *log_size = le32_to_cpu(resp->log_size -
-                                        sizeof(u32));
+                        *log_size = le32_to_cpu(resp->log_size) -
+                                        sizeof(u32);
         }
 err:
         spin_unlock_bh(&adapter->mcc_lock);
@@ -1228,7 +1228,8 @@ void be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf)
         struct be_mcc_wrb *wrb;
         struct be_cmd_req_get_fat *req;
         struct be_sge *sge;
-        u32 offset = 0, total_size, buf_size, log_offset = sizeof(u32);
+        u32 offset = 0, total_size, buf_size,
+                                log_offset = sizeof(u32), payload_len;
         int status;
 
         if (buf_len == 0)
@@ -1236,37 +1237,39 @@ void be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf)
 
         total_size = buf_len;
 
+        get_fat_cmd.size = sizeof(struct be_cmd_req_get_fat) + 60*1024;
+        get_fat_cmd.va = pci_alloc_consistent(adapter->pdev,
+                        get_fat_cmd.size,
+                        &get_fat_cmd.dma);
+        if (!get_fat_cmd.va) {
+                status = -ENOMEM;
+                dev_err(&adapter->pdev->dev,
+                "Memory allocation failure while retrieving FAT data\n");
+                return;
+        }
+
         spin_lock_bh(&adapter->mcc_lock);
 
-        wrb = wrb_from_mccq(adapter);
-        if (!wrb) {
-                status = -EBUSY;
-                goto err;
-        }
         while (total_size) {
                 buf_size = min(total_size, (u32)60*1024);
                 total_size -= buf_size;
 
-                get_fat_cmd.size = sizeof(struct be_cmd_req_get_fat) + buf_size;
-                get_fat_cmd.va = pci_alloc_consistent(adapter->pdev,
-                                        get_fat_cmd.size,
-                                        &get_fat_cmd.dma);
-                if (!get_fat_cmd.va) {
-                        status = -ENOMEM;
-                        dev_err(&adapter->pdev->dev,
-                                        "Memory allocation failure while retrieving FAT data\n");
+                wrb = wrb_from_mccq(adapter);
+                if (!wrb) {
+                        status = -EBUSY;
                         goto err;
                 }
                 req = get_fat_cmd.va;
                 sge = nonembedded_sgl(wrb);
 
-                be_wrb_hdr_prepare(wrb, get_fat_cmd.size, false, 1,
+                payload_len = sizeof(struct be_cmd_req_get_fat) + buf_size;
+                be_wrb_hdr_prepare(wrb, payload_len, false, 1,
                                 OPCODE_COMMON_MANAGE_FAT);
 
                 be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
-                                OPCODE_COMMON_MANAGE_FAT, get_fat_cmd.size);
+                                OPCODE_COMMON_MANAGE_FAT, payload_len);
 
-                sge->pa_hi = cpu_to_le32(upper_32_bits(get_fat_cmd.size));
+                sge->pa_hi = cpu_to_le32(upper_32_bits(get_fat_cmd.dma));
                 sge->pa_lo = cpu_to_le32(get_fat_cmd.dma & 0xFFFFFFFF);
                 sge->len = cpu_to_le32(get_fat_cmd.size);
 
@@ -1281,17 +1284,17 @@ void be_cmd_get_regs(struct be_adapter *adapter, u32 buf_len, void *buf)
                         memcpy(buf + offset,
                                 resp->data_buffer,
                                 resp->read_log_length);
-                }
-                pci_free_consistent(adapter->pdev, get_fat_cmd.size,
-                                get_fat_cmd.va,
-                                get_fat_cmd.dma);
-                if (status)
+                } else {
                         dev_err(&adapter->pdev->dev, "FAT Table Retrieve error\n");
-
+                        goto err;
+                }
                 offset += buf_size;
                 log_offset += buf_size;
         }
 err:
+        pci_free_consistent(adapter->pdev, get_fat_cmd.size,
+                        get_fat_cmd.va,
+                        get_fat_cmd.dma);
         spin_unlock_bh(&adapter->mcc_lock);
 }
 
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 123dd602261f..d0981c2ffbda 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2465,35 +2465,16 @@ out:
         return NETDEV_TX_OK;
 }
 
-int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype, struct net_device *orig_dev)
+void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
+                          struct slave *slave)
 {
-        struct bonding *bond = netdev_priv(dev);
-        struct slave *slave = NULL;
-        int ret = NET_RX_DROP;
-
-        if (!(dev->flags & IFF_MASTER))
-                goto out;
-
-        skb = skb_share_check(skb, GFP_ATOMIC);
-        if (!skb)
-                goto out;
+        if (skb->protocol != PKT_TYPE_LACPDU)
+                return;
 
         if (!pskb_may_pull(skb, sizeof(struct lacpdu)))
-                goto out;
+                return;
 
         read_lock(&bond->lock);
-        slave = bond_get_slave_by_dev(netdev_priv(dev), orig_dev);
-        if (!slave)
-                goto out_unlock;
-
         bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);
-
-        ret = NET_RX_SUCCESS;
-
-out_unlock:
         read_unlock(&bond->lock);
-out:
-        dev_kfree_skb(skb);
-
-        return ret;
 }
diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
index b28baff70864..291dbd4d1f3d 100644
--- a/drivers/net/bonding/bond_3ad.h
+++ b/drivers/net/bonding/bond_3ad.h
@@ -258,7 +258,6 @@ struct ad_bond_info {
                                  * requested
                                  */
         struct timer_list ad_timer;
-        struct packet_type ad_pkt_type;
 };
 
 struct ad_slave_info {
@@ -280,7 +279,8 @@ void bond_3ad_adapter_duplex_changed(struct slave *slave);
 void bond_3ad_handle_link_change(struct slave *slave, char link);
 int  bond_3ad_get_active_agg_info(struct bonding *bond, struct ad_info *ad_info);
 int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev);
-int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype, struct net_device *orig_dev);
+void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
+                          struct slave *slave);
 int bond_3ad_set_carrier(struct bonding *bond);
 #endif //__BOND_3AD_H__
 
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index ba715826e2a8..3b7b0409406f 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -308,49 +308,33 @@ static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)
         _unlock_rx_hashtbl(bond);
 }
 
-static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct packet_type *ptype, struct net_device *orig_dev)
+static void rlb_arp_recv(struct sk_buff *skb, struct bonding *bond,
+                         struct slave *slave)
 {
-        struct bonding *bond;
-        struct arp_pkt *arp = (struct arp_pkt *)skb->data;
-        int res = NET_RX_DROP;
+        struct arp_pkt *arp;
 
-        while (bond_dev->priv_flags & IFF_802_1Q_VLAN)
-                bond_dev = vlan_dev_real_dev(bond_dev);
-
-        if (!(bond_dev->priv_flags & IFF_BONDING) ||
-            !(bond_dev->flags & IFF_MASTER))
-                goto out;
+        if (skb->protocol != cpu_to_be16(ETH_P_ARP))
+                return;
 
+        arp = (struct arp_pkt *) skb->data;
         if (!arp) {
                 pr_debug("Packet has no ARP data\n");
-                goto out;
+                return;
         }
 
-        skb = skb_share_check(skb, GFP_ATOMIC);
-        if (!skb)
-                goto out;
-
-        if (!pskb_may_pull(skb, arp_hdr_len(bond_dev)))
-                goto out;
+        if (!pskb_may_pull(skb, arp_hdr_len(bond->dev)))
+                return;
 
         if (skb->len < sizeof(struct arp_pkt)) {
                 pr_debug("Packet is too small to be an ARP\n");
-                goto out;
+                return;
         }
 
         if (arp->op_code == htons(ARPOP_REPLY)) {
                 /* update rx hash table for this ARP */
-                bond = netdev_priv(bond_dev);
                 rlb_update_entry_from_arp(bond, arp);
                 pr_debug("Server received an ARP Reply from client\n");
         }
-
-        res = NET_RX_SUCCESS;
-
-out:
-        dev_kfree_skb(skb);
-
-        return res;
 }
 
 /* Caller must hold bond lock for read */
@@ -759,7 +743,6 @@ static void rlb_init_table_entry(struct rlb_client_info *entry)
 static int rlb_initialize(struct bonding *bond)
 {
         struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
-        struct packet_type *pk_type = &(BOND_ALB_INFO(bond).rlb_pkt_type);
         struct rlb_client_info  *new_hashtbl;
         int size = RLB_HASH_TABLE_SIZE * sizeof(struct rlb_client_info);
         int i;
@@ -784,13 +767,8 @@ static int rlb_initialize(struct bonding *bond)
 
         _unlock_rx_hashtbl(bond);
 
-        /*initialize packet type*/
-        pk_type->type = cpu_to_be16(ETH_P_ARP);
-        pk_type->dev = bond->dev;
-        pk_type->func = rlb_arp_recv;
-
         /* register to receive ARPs */
-        dev_add_pack(pk_type);
+        bond->recv_probe = rlb_arp_recv;
 
         return 0;
 }
@@ -799,8 +777,6 @@ static void rlb_deinitialize(struct bonding *bond)
 {
         struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
 
-        dev_remove_pack(&(bond_info->rlb_pkt_type));
-
         _lock_rx_hashtbl(bond);
 
         kfree(bond_info->rx_hashtbl);
diff --git a/drivers/net/bonding/bond_alb.h b/drivers/net/bonding/bond_alb.h
index 8ca7158b2dda..90f140a2d197 100644
--- a/drivers/net/bonding/bond_alb.h
+++ b/drivers/net/bonding/bond_alb.h
@@ -129,7 +129,6 @@ struct alb_bond_info {
         int                     lp_counter;
         /* -------- rlb parameters -------- */
         int rlb_enabled;
-        struct packet_type      rlb_pkt_type;
         struct rlb_client_info  *rx_hashtbl;    /* Receive hash table */
         spinlock_t              rx_hashtbl_lock;
         u32                     rx_hashtbl_head;
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 4ce14bdf96dd..66d9dc6e5cac 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1439,27 +1439,17 @@ static void bond_setup_by_slave(struct net_device *bond_dev,
 }
 
 /* On bonding slaves other than the currently active slave, suppress
- * duplicates except for 802.3ad ETH_P_SLOW, alb non-mcast/bcast, and
- * ARP on active-backup slaves with arp_validate enabled.
+ * duplicates except for alb non-mcast/bcast.
  */
 static bool bond_should_deliver_exact_match(struct sk_buff *skb,
                                             struct slave *slave,
                                             struct bonding *bond)
 {
         if (bond_is_slave_inactive(slave)) {
-                if (slave_do_arp_validate(bond, slave) &&
-                    skb->protocol == __cpu_to_be16(ETH_P_ARP))
-                        return false;
-
                 if (bond->params.mode == BOND_MODE_ALB &&
                     skb->pkt_type != PACKET_BROADCAST &&
                     skb->pkt_type != PACKET_MULTICAST)
-                                return false;
-
-                if (bond->params.mode == BOND_MODE_8023AD &&
-                    skb->protocol == __cpu_to_be16(ETH_P_SLOW))
                         return false;
-
                 return true;
         }
         return false;
@@ -1483,6 +1473,15 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
         if (bond->params.arp_interval)
                 slave->dev->last_rx = jiffies;
 
+        if (bond->recv_probe) {
+                struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC);
+
+                if (likely(nskb)) {
+                        bond->recv_probe(nskb, bond, slave);
+                        dev_kfree_skb(nskb);
+                }
+        }
+
         if (bond_should_deliver_exact_match(skb, slave, bond)) {
                 return RX_HANDLER_EXACT;
         }
@@ -2743,48 +2742,26 @@ static void bond_validate_arp(struct bonding *bond, struct slave *slave, __be32
         }
 }
 
-static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)
+static void bond_arp_rcv(struct sk_buff *skb, struct bonding *bond,
+                         struct slave *slave)
 {
         struct arphdr *arp;
-        struct slave *slave;
-        struct bonding *bond;
         unsigned char *arp_ptr;
         __be32 sip, tip;
 
-        if (dev->priv_flags & IFF_802_1Q_VLAN) {
-                /*
-                 * When using VLANS and bonding, dev and oriv_dev may be
-                 * incorrect if the physical interface supports VLAN
-                 * acceleration.  With this change ARP validation now
-                 * works for hosts only reachable on the VLAN interface.
-                 */
-                dev = vlan_dev_real_dev(dev);
-                orig_dev = dev_get_by_index_rcu(dev_net(skb->dev),skb->skb_iif);
-        }
-
-        if (!(dev->priv_flags & IFF_BONDING) || !(dev->flags & IFF_MASTER))
-                goto out;
+        if (skb->protocol != __cpu_to_be16(ETH_P_ARP))
+                return;
 
-        bond = netdev_priv(dev);
         read_lock(&bond->lock);
 
-        pr_debug("bond_arp_rcv: bond %s skb->dev %s orig_dev %s\n",
-                 bond->dev->name, skb->dev ? skb->dev->name : "NULL",
-                 orig_dev ? orig_dev->name : "NULL");
+        pr_debug("bond_arp_rcv: bond %s skb->dev %s\n",
+                 bond->dev->name, skb->dev->name);
 
-        slave = bond_get_slave_by_dev(bond, orig_dev);
-        if (!slave || !slave_do_arp_validate(bond, slave))
-                goto out_unlock;
-
-        skb = skb_share_check(skb, GFP_ATOMIC);
-        if (!skb)
-                goto out_unlock;
-
-        if (!pskb_may_pull(skb, arp_hdr_len(dev)))
+        if (!pskb_may_pull(skb, arp_hdr_len(bond->dev)))
                 goto out_unlock;
 
         arp = arp_hdr(skb);
-        if (arp->ar_hln != dev->addr_len ||
+        if (arp->ar_hln != bond->dev->addr_len ||
             skb->pkt_type == PACKET_OTHERHOST ||
             skb->pkt_type == PACKET_LOOPBACK ||
             arp->ar_hrd != htons(ARPHRD_ETHER) ||
@@ -2793,9 +2770,9 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
                 goto out_unlock;
 
         arp_ptr = (unsigned char *)(arp + 1);
-        arp_ptr += dev->addr_len;
+        arp_ptr += bond->dev->addr_len;
         memcpy(&sip, arp_ptr, 4);
-        arp_ptr += 4 + dev->addr_len;
+        arp_ptr += 4 + bond->dev->addr_len;
         memcpy(&tip, arp_ptr, 4);
 
         pr_debug("bond_arp_rcv: %s %s/%d av %d sv %d sip %pI4 tip %pI4\n",
@@ -2818,9 +2795,6 @@ static int bond_arp_rcv(struct sk_buff *skb, struct net_device *dev, struct pack
 
 out_unlock:
         read_unlock(&bond->lock);
-out:
-        dev_kfree_skb(skb);
-        return NET_RX_SUCCESS;
 }
 
 /*
@@ -3407,48 +3381,6 @@ static struct notifier_block bond_inetaddr_notifier = {
         .notifier_call = bond_inetaddr_event,
 };
 
-/*-------------------------- Packet type handling ---------------------------*/
-
-/* register to receive lacpdus on a bond */
-static void bond_register_lacpdu(struct bonding *bond)
-{
-        struct packet_type *pk_type = &(BOND_AD_INFO(bond).ad_pkt_type);
-
-        /* initialize packet type */
-        pk_type->type = PKT_TYPE_LACPDU;
-        pk_type->dev = bond->dev;
-        pk_type->func = bond_3ad_lacpdu_recv;
-
-        dev_add_pack(pk_type);
-}
-
-/* unregister to receive lacpdus on a bond */
-static void bond_unregister_lacpdu(struct bonding *bond)
-{
-        dev_remove_pack(&(BOND_AD_INFO(bond).ad_pkt_type));
-}
-
-void bond_register_arp(struct bonding *bond)
-{
-        struct packet_type *pt = &bond->arp_mon_pt;
-
-        if (pt->type)
-                return;
-
-        pt->type = htons(ETH_P_ARP);
-        pt->dev = bond->dev;
-        pt->func = bond_arp_rcv;
-        dev_add_pack(pt);
-}
-
-void bond_unregister_arp(struct bonding *bond)
-{
-        struct packet_type *pt = &bond->arp_mon_pt;
-
-        dev_remove_pack(pt);
-        pt->type = 0;
-}
-
 /*---------------------------- Hashing Policies -----------------------------*/
 
 /*
@@ -3542,14 +3474,14 @@ static int bond_open(struct net_device *bond_dev)
 
                 queue_delayed_work(bond->wq, &bond->arp_work, 0);
                 if (bond->params.arp_validate)
-                        bond_register_arp(bond);
+                        bond->recv_probe = bond_arp_rcv;
         }
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 INIT_DELAYED_WORK(&bond->ad_work, bond_3ad_state_machine_handler);
                 queue_delayed_work(bond->wq, &bond->ad_work, 0);
                 /* register to receive LACPDUs */
-                bond_register_lacpdu(bond);
+                bond->recv_probe = bond_3ad_lacpdu_recv;
                 bond_3ad_initiate_agg_selection(bond, 1);
         }
 
@@ -3560,14 +3492,6 @@ static int bond_close(struct net_device *bond_dev)
 {
         struct bonding *bond = netdev_priv(bond_dev);
 
-        if (bond->params.mode == BOND_MODE_8023AD) {
-                /* Unregister the receive of LACPDUs */
-                bond_unregister_lacpdu(bond);
-        }
-
-        if (bond->params.arp_validate)
-                bond_unregister_arp(bond);
-
         write_lock_bh(&bond->lock);
 
         /* signal timers not to re-arm */
@@ -3604,6 +3528,7 @@ static int bond_close(struct net_device *bond_dev)
                  */
                 bond_alb_deinitialize(bond);
         }
+        bond->recv_probe = NULL;
 
         return 0;
 }
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 259ff32cd573..935406aa5f0c 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -422,11 +422,6 @@ static ssize_t bonding_store_arp_validate(struct device *d,
                 bond->dev->name, arp_validate_tbl[new_value].modename,
                 new_value);
 
-        if (!bond->params.arp_validate && new_value)
-                bond_register_arp(bond);
-        else if (bond->params.arp_validate && !new_value)
-                bond_unregister_arp(bond);
-
         bond->params.arp_validate = new_value;
 
         return count;
@@ -923,7 +918,6 @@ static ssize_t bonding_store_miimon(struct device *d,
                                 bond->dev->name);
                         bond->params.arp_interval = 0;
                         if (bond->params.arp_validate) {
-                                bond_unregister_arp(bond);
                                 bond->params.arp_validate =
                                         BOND_ARP_VALIDATE_NONE;
                         }
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 6126c6a13a74..85fb8220e283 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -226,6 +226,8 @@ struct bonding {
         struct   slave *primary_slave;
         bool     force_primary;
         s32      slave_cnt; /* never change this value outside the attach/detach wrappers */
+        void     (*recv_probe)(struct sk_buff *, struct bonding *,
+                               struct slave *);
         rwlock_t lock;
         rwlock_t curr_slave_lock;
         s8       kill_timers;
@@ -399,8 +401,6 @@ void bond_set_mode_ops(struct bonding *bond, int mode);
 int bond_parse_parm(const char *mode_arg, const struct bond_parm_tbl *tbl);
 void bond_select_active_slave(struct bonding *bond);
 void bond_change_active_slave(struct bonding *bond, struct slave *new_active);
-void bond_register_arp(struct bonding *);
-void bond_unregister_arp(struct bonding *);
 void bond_create_debugfs(void);
 void bond_destroy_debugfs(void);
 void bond_debug_register(struct bonding *bond);
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 7c4d92c0dd1d..582e4ae70753 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -42,8 +42,6 @@ struct prefix_info {
 };
 
 
-#ifdef __KERNEL__
-
 #include <linux/netdevice.h>
 #include <net/if_inet6.h>
 #include <net/ipv6.h>
@@ -285,4 +283,3 @@ extern void if6_proc_exit(void);
 #endif
 
 #endif
-#endif
diff --git a/include/net/af_rxrpc.h b/include/net/af_rxrpc.h
index 00c2eaa07c25..03e6e9453623 100644
--- a/include/net/af_rxrpc.h
+++ b/include/net/af_rxrpc.h
@@ -12,8 +12,6 @@
 #ifndef _NET_RXRPC_H
 #define _NET_RXRPC_H
 
-#ifdef __KERNEL__
-
 #include <linux/rxrpc.h>
 
 struct rxrpc_call;
@@ -53,5 +51,4 @@ extern struct rxrpc_call *rxrpc_kernel_accept_call(struct socket *,
                                                    unsigned long);
 extern int rxrpc_kernel_reject_call(struct socket *);
 
-#endif /* __KERNEL__ */
 #endif /* _NET_RXRPC_H */
diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index 18e5c3f67580..91ab5b01678a 100644
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -41,7 +41,6 @@ struct unix_skb_parms {
                                 spin_lock_nested(&unix_sk(s)->lock, \
                                 SINGLE_DEPTH_NESTING)
 
-#ifdef __KERNEL__
 /* The AF_UNIX socket */
 struct unix_sock {
         /* WARNING: sk has to be the first member */
@@ -72,4 +71,3 @@ static inline int unix_sysctl_register(struct net *net) { return 0; }
 static inline void unix_sysctl_unregister(struct net *net) {}
 #endif
 #endif
-#endif
diff --git a/include/net/atmclip.h b/include/net/atmclip.h
index 467c531b8a7e..497ef6444a7a 100644
--- a/include/net/atmclip.h
+++ b/include/net/atmclip.h
@@ -54,8 +54,6 @@ struct clip_priv {
 };
 
 
-#ifdef __KERNEL__
 extern struct neigh_table *clip_tbl_hook;
-#endif
 
 #endif
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 6138e313d175..499b7b7c7c9a 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1067,7 +1067,6 @@ struct hci_sco_hdr {
         __u8    dlen;
 } __packed;
 
-#ifdef __KERNEL__
 #include <linux/skbuff.h>
 static inline struct hci_event_hdr *hci_event_hdr(const struct sk_buff *skb)
 {
@@ -1083,7 +1082,6 @@ static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb)
 {
         return (struct hci_sco_hdr *) skb->data;
 }
-#endif
 
 /* Command opcode pack/unpack */
 #define hci_opcode_pack(ogf, ocf)       (__u16) ((ocf & 0x03ff)|(ogf << 10))
diff --git a/include/net/dst.h b/include/net/dst.h
index 75b95df4afe7..d7bb74062df1 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -92,8 +92,6 @@ struct dst_entry {
         };
 };
 
-#ifdef __KERNEL__
-
 extern u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old);
 extern const u32 dst_default_metrics[RTAX_MAX];
 
@@ -438,6 +436,5 @@ extern struct dst_entry *xfrm_lookup(struct net *net, struct dst_entry *dst_orig
                                      const struct flowi *fl, struct sock *sk,
                                      int flags);
 #endif
-#endif
 
 #endif /* _NET_DST_H */
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 3d982f72d48e..0c603fe65377 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -30,8 +30,6 @@
 #define IF_PREFIX_ONLINK        0x01
 #define IF_PREFIX_AUTOCONF      0x02
 
-#ifdef __KERNEL__
-
 enum {
         INET6_IFADDR_STATE_DAD,
         INET6_IFADDR_STATE_POSTDAD,
@@ -303,4 +301,3 @@ static inline int ipv6_ipgre_mc_map(const struct in6_addr *addr,
 }
 
 #endif
-#endif
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index aca8ef4dd67c..477ef75f3873 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -13,8 +13,6 @@
 #ifndef _IP6_FIB_H
 #define _IP6_FIB_H
 
-#ifdef __KERNEL__
-
 #include <linux/ipv6_route.h>
 #include <linux/rtnetlink.h>
 #include <linux/spinlock.h>
@@ -240,4 +238,3 @@ static inline void              fib6_rules_cleanup(void)
 }
 #endif
 #endif
-#endif
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index d5c21d4d9e7e..5e91b72fc718 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -21,8 +21,6 @@ struct route_info {
         __u8                    prefix[0];      /* 0,8 or 16 */
 };
 
-#ifdef __KERNEL__
-
 #include <net/flow.h>
 #include <net/ip6_fib.h>
 #include <net/sock.h>
@@ -193,4 +191,3 @@ static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
 }
 
 #endif
-#endif
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index d516f00c8e0f..e0b7f139aa88 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -8,9 +8,6 @@
 
 #include <linux/ip_vs.h>                /* definitions shared with userland */
 
-/* old ipvsadm versions still include this file directly */
-#ifdef __KERNEL__
-
 #include <asm/types.h>                  /* for __uXX types */
 
 #include <linux/sysctl.h>               /* for ctl_path */
@@ -1415,6 +1412,4 @@ ip_vs_dest_conn_overhead(struct ip_vs_dest *dest)
                 atomic_read(&dest->inactconns);
 }
 
-#endif /* __KERNEL__ */
-
 #endif  /* _NET_IP_VS_H */
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 5da192653153..e1c60b43e73b 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -77,11 +77,9 @@
 /*
  *      Addr scopes
  */
-#ifdef __KERNEL__
 #define IPV6_ADDR_MC_SCOPE(a)   \
         ((a)->s6_addr[1] & 0x0f)        /* nonstandard */
 #define __IPV6_ADDR_SCOPE_INVALID       -1
-#endif
 #define IPV6_ADDR_SCOPE_NODELOCAL       0x01
 #define IPV6_ADDR_SCOPE_LINKLOCAL       0x02
 #define IPV6_ADDR_SCOPE_SITELOCAL       0x05
@@ -91,14 +89,12 @@
 /*
  *      Addr flags
  */
-#ifdef __KERNEL__
 #define IPV6_ADDR_MC_FLAG_TRANSIENT(a)  \
         ((a)->s6_addr[1] & 0x10)
 #define IPV6_ADDR_MC_FLAG_PREFIX(a)     \
         ((a)->s6_addr[1] & 0x20)
 #define IPV6_ADDR_MC_FLAG_RENDEZVOUS(a) \
         ((a)->s6_addr[1] & 0x40)
-#endif
 
 /*
  *      fragmentation header
@@ -113,8 +109,6 @@ struct frag_hdr {
 
 #define IP6_MF  0x0001
 
-#ifdef __KERNEL__
-
 #include <net/sock.h>
 
 /* sysctls */
@@ -667,5 +661,4 @@ extern int ipv6_static_sysctl_register(void);
 extern void ipv6_static_sysctl_unregister(void);
 #endif
 
-#endif /* __KERNEL__ */
 #endif /* _NET_IPV6_H */
diff --git a/include/net/ipx.h b/include/net/ipx.h
index 05d7e4a88b49..c1fec6b464cc 100644
--- a/include/net/ipx.h
+++ b/include/net/ipx.h
@@ -80,7 +80,6 @@ struct ipx_route {
         atomic_t                refcnt;
 };
 
-#ifdef __KERNEL__
 struct ipx_cb {
         u8      ipx_tctrl;
         __be32  ipx_dest_net;
@@ -116,7 +115,6 @@ static inline struct ipx_sock *ipx_sk(struct sock *sk)
 }
 
 #define IPX_SKB_CB(__skb) ((struct ipx_cb *)&((__skb)->cb[0]))
-#endif
 
 #define IPX_MIN_EPHEMERAL_SOCKET        0x4000
 #define IPX_MAX_EPHEMERAL_SOCKET        0x7fff
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 6144685d601b..62beeb97c4b1 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -42,8 +42,6 @@ enum {
 #define ND_REACHABLE_TIME               (30*HZ)
 #define ND_RETRANS_TIMER                HZ
 
-#ifdef __KERNEL__
-
 #include <linux/compiler.h>
 #include <linux/icmpv6.h>
 #include <linux/in6.h>
@@ -156,8 +154,4 @@ static inline struct neighbour * ndisc_get_neigh(struct net_device *dev, const s
         return ERR_PTR(-ENODEV);
 }
 
-
-#endif /* __KERNEL__ */
-
-
 #endif
diff --git a/include/net/netevent.h b/include/net/netevent.h
index 22b239c17eaa..086f8a5b59dc 100644
--- a/include/net/netevent.h
+++ b/include/net/netevent.h
@@ -10,7 +10,6 @@
  *
  *      Changes:
  */
-#ifdef __KERNEL__
 
 struct dst_entry;
 
@@ -29,4 +28,3 @@ extern int unregister_netevent_notifier(struct notifier_block *nb);
 extern int call_netevent_notifiers(unsigned long val, void *v);
 
 #endif
-#endif
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index d0d13378991e..c7c42e7acc31 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -14,7 +14,6 @@
 
 #include <linux/netfilter/nf_conntrack_common.h>
 
-#ifdef __KERNEL__
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <asm/atomic.h>
@@ -326,5 +325,4 @@ do {							\
 #define MODULE_ALIAS_NFCT_HELPER(helper) \
         MODULE_ALIAS("nfct-helper-" helper)
 
-#endif /* __KERNEL__ */
 #endif /* _NF_CONNTRACK_H */
diff --git a/include/net/netfilter/nf_conntrack_tuple.h b/include/net/netfilter/nf_conntrack_tuple.h
index 4ee44c84a304..7ca6bdd5bae6 100644
--- a/include/net/netfilter/nf_conntrack_tuple.h
+++ b/include/net/netfilter/nf_conntrack_tuple.h
@@ -104,8 +104,6 @@ struct nf_conntrack_tuple_mask {
         } src;
 };
 
-#ifdef __KERNEL__
-
 static inline void nf_ct_dump_tuple_ip(const struct nf_conntrack_tuple *t)
 {
 #ifdef DEBUG
@@ -148,8 +146,6 @@ struct nf_conntrack_tuple_hash {
         struct nf_conntrack_tuple tuple;
 };
 
-#endif /* __KERNEL__ */
-
 static inline bool __nf_ct_tuple_src_equal(const struct nf_conntrack_tuple *t1,
                                            const struct nf_conntrack_tuple *t2)
 { 
diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h
index aff80b190c12..0346b0070864 100644
--- a/include/net/netfilter/nf_nat.h
+++ b/include/net/netfilter/nf_nat.h
@@ -48,7 +48,6 @@ struct nf_nat_multi_range_compat {
         struct nf_nat_range range[1];
 };
 
-#ifdef __KERNEL__
 #include <linux/list.h>
 #include <linux/netfilter/nf_conntrack_pptp.h>
 #include <net/netfilter/nf_conntrack_extend.h>
@@ -93,7 +92,4 @@ static inline struct nf_conn_nat *nfct_nat(const struct nf_conn *ct)
 #endif
 }
 
-#else  /* !__KERNEL__: iptables wants this to compile. */
-#define nf_nat_multi_range nf_nat_multi_range_compat
-#endif /*__KERNEL__*/
 #endif
diff --git a/include/net/rawv6.h b/include/net/rawv6.h
index f6b9b830df8c..cf7577234457 100644
--- a/include/net/rawv6.h
+++ b/include/net/rawv6.h
@@ -1,8 +1,6 @@
 #ifndef _NET_RAWV6_H
 #define _NET_RAWV6_H
 
-#ifdef __KERNEL__
-
 #include <net/protocol.h>
 
 void raw6_icmp_error(struct sk_buff *, int nexthdr,
@@ -20,5 +18,3 @@ int rawv6_mh_filter_unregister(int (*filter)(struct sock *sock,
 #endif
 
 #endif
-
-#endif
diff --git a/include/net/route.h b/include/net/route.h
index b3962e249e14..3684c3edbae4 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -35,10 +35,6 @@
 #include <linux/cache.h>
 #include <linux/security.h>
 
-#ifndef __KERNEL__
-#warning This file is not supposed to be used outside of kernel.
-#endif
-
 #define RTO_ONLINK      0x01
 
 #define RTO_CONN        0
diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h
index a8122dc56410..5271a741c3a3 100644
--- a/include/net/transp_v6.h
+++ b/include/net/transp_v6.h
@@ -7,8 +7,6 @@
  *      IPv6 transport protocols
  */
 
-#ifdef __KERNEL__
-
 extern struct proto rawv6_prot;
 extern struct proto udpv6_prot;
 extern struct proto udplitev6_prot;
@@ -57,5 +55,3 @@ extern const struct inet_connection_sock_af_ops ipv4_specific;
 extern void inet6_destroy_sock(struct sock *sk);
 
 #endif
-
-#endif
diff --git a/include/net/wimax.h b/include/net/wimax.h
index c799ba7b708b..7328d5019d88 100644
--- a/include/net/wimax.h
+++ b/include/net/wimax.h
@@ -250,7 +250,6 @@
 
 #ifndef __NET__WIMAX_H__
 #define __NET__WIMAX_H__
-#ifdef __KERNEL__
 
 #include <linux/wimax.h>
 #include <net/genetlink.h>
@@ -518,8 +517,4 @@ extern ssize_t wimax_msg_len(struct sk_buff *);
 extern int wimax_rfkill(struct wimax_dev *, enum wimax_rf_state);
 extern int wimax_reset(struct wimax_dev *);
 
-#else
-/* You might be looking for linux/wimax.h */
-#error This file should not be included from user space.
-#endif /* #ifdef __KERNEL__ */
 #endif /* #ifndef __NET__WIMAX_H__ */
diff --git a/net/core/dev.c b/net/core/dev.c
index 379c993ff421..3bbb4c2ce92e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1315,7 +1315,8 @@ void dev_disable_lro(struct net_device *dev)
                 return;
 
         __ethtool_set_flags(dev, flags & ~ETH_FLAG_LRO);
-        WARN_ON(dev->features & NETIF_F_LRO);
+        if (unlikely(dev->features & NETIF_F_LRO))
+                netdev_WARN(dev, "failed to disable LRO!\n");
 }
 EXPORT_SYMBOL(dev_disable_lro);
 
@@ -3076,25 +3077,6 @@ void netdev_rx_handler_unregister(struct net_device *dev)
 }
 EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
 
-static void vlan_on_bond_hook(struct sk_buff *skb)
-{
-        /*
-         * Make sure ARP frames received on VLAN interfaces stacked on
-         * bonding interfaces still make their way to any base bonding
-         * device that may have registered for a specific ptype.
-         */
-        if (skb->dev->priv_flags & IFF_802_1Q_VLAN &&
-            vlan_dev_real_dev(skb->dev)->priv_flags & IFF_BONDING &&
-            skb->protocol == htons(ETH_P_ARP)) {
-                struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
-
-                if (!skb2)
-                        return;
-                skb2->dev = vlan_dev_real_dev(skb->dev);
-                netif_rx(skb2);
-        }
-}
-
 static int __netif_receive_skb(struct sk_buff *skb)
 {
         struct packet_type *ptype, *pt_prev;
@@ -3190,8 +3172,6 @@ ncls:
                         goto out;
         }
 
-        vlan_on_bond_hook(skb);
-
         /* deliver only exact match when indicated */
         null_or_dev = deliver_exact ? skb->dev : NULL;