Merge remote-tracking branch 'wireless-next/master' into mac80211-next

1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index f3c7c24bec1c..fbfdb9d8d3a7 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -24,7 +24,8 @@ struct netpoll {
         struct net_device *dev;
         char dev_name[IFNAMSIZ];
         const char *name;
-        void (*rx_hook)(struct netpoll *, int, char *, int);
+        void (*rx_skb_hook)(struct netpoll *np, int source, struct sk_buff *skb,
+                            int offset, int len);
 
         union inet_addr local_ip, remote_ip;
         bool ipv6;
@@ -41,7 +42,7 @@ struct netpoll_info {
         unsigned long rx_flags;
         spinlock_t rx_lock;
         struct semaphore dev_lock;
-        struct list_head rx_np; /* netpolls that registered an rx_hook */
+        struct list_head rx_np; /* netpolls that registered an rx_skb_hook */
 
         struct sk_buff_head neigh_tx; /* list of neigh requests to reply to */
         struct sk_buff_head txq;