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 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
drivers
/
net
/
e1000
/
e1000.h
diff --git
a/drivers/net/e1000/e1000.h
b/drivers/net/e1000/e1000.h
index
8676899
..
24f41da
100644
(file)
--- a/
drivers/net/e1000/e1000.h
+++ b/
drivers/net/e1000/e1000.h
@@
-215,7
+215,7
@@
struct e1000_adapter {
struct timer_list tx_fifo_stall_timer;
struct timer_list watchdog_timer;
struct timer_list phy_info_timer;
struct timer_list tx_fifo_stall_timer;
struct timer_list watchdog_timer;
struct timer_list phy_info_timer;
-
struct vlan_group *vlgrp
;
+
unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)]
;
u16 mng_vlan_id;
u32 bd_number;
u32 rx_buffer_len;
u16 mng_vlan_id;
u32 bd_number;
u32 rx_buffer_len;