git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
infiniband
/
hw
/
nes
/
nes_hw.h
diff --git
a/drivers/infiniband/hw/nes/nes_hw.h
b/drivers/infiniband/hw/nes/nes_hw.h
index
9159411
..
c324147
100644
(file)
--- a/
drivers/infiniband/hw/nes/nes_hw.h
+++ b/
drivers/infiniband/hw/nes/nes_hw.h
@@
-1211,7
+1211,6
@@
struct nes_vnic {
/* void *mem; */
struct nes_device *nesdev;
struct net_device *netdev;
/* void *mem; */
struct nes_device *nesdev;
struct net_device *netdev;
- struct vlan_group *vlan_grp;
atomic_t rx_skbs_needed;
atomic_t rx_skb_timer_running;
int budget;
atomic_t rx_skbs_needed;
atomic_t rx_skb_timer_running;
int budget;
@@
-1357,7
+1356,4
@@
struct nes_terminate_hdr {
#define NES_LINK_RECHECK_DELAY msecs_to_jiffies(50)
#define NES_LINK_RECHECK_MAX 60
#define NES_LINK_RECHECK_DELAY msecs_to_jiffies(50)
#define NES_LINK_RECHECK_MAX 60
-#define nes_vlan_rx vlan_hwaccel_receive_skb
-#define nes_netif_rx netif_receive_skb
-
#endif /* __NES_HW_H */
#endif /* __NES_HW_H */