Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[linux-2.6-omap-h63xx.git] / include / linux / netpoll.h

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 20250d963d72014a81a687ca7652bad4a873bceb..e38d3c9dccda9471e62f0102a6e20c5a3140e032 100644 (file)
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -20,7 +20,7 @@ struct netpoll {
 
        u32 local_ip, remote_ip;
        u16 local_port, remote_port;
-       u8 local_mac[ETH_ALEN], remote_mac[ETH_ALEN];
+       u8 remote_mac[ETH_ALEN];
 };
 
 struct netpoll_info {
@@ -94,11 +94,6 @@ static inline void netpoll_poll_unlock(void *have)
        rcu_read_unlock();
 }
 
-static inline void netpoll_netdev_init(struct net_device *dev)
-{
-       INIT_LIST_HEAD(&dev->napi_list);
-}
-
 #else
 static inline int netpoll_rx(struct sk_buff *skb)
 {