diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 14:18:36 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 14:18:36 -0700 |
| commit | 7e66eaf14e19c032433be7c4df3c892fa2a5282f (patch) | |
| tree | 56b0d5f9d16eb18744e102f3f216715196cd62e6 /drivers/net/igb/igb.h | |
| parent | d3654d7ef3adad0083525cfb6fe27be62cb83d0d (diff) | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
Merge commit 'v3.1-rc4' into next
Diffstat (limited to 'drivers/net/igb/igb.h')
| -rw-r--r-- | drivers/net/igb/igb.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h index f4fa4b1751c..265e151b66c 100644 --- a/drivers/net/igb/igb.h +++ b/drivers/net/igb/igb.h @@ -1,7 +1,7 @@ /******************************************************************************* Intel(R) Gigabit Ethernet Linux driver - Copyright(c) 2007-2009 Intel Corporation. + Copyright(c) 2007-2011 Intel Corporation. This program is free software; you can redistribute it and/or modify it under the terms and conditions of the GNU General Public License, @@ -37,6 +37,8 @@ #include <linux/clocksource.h> #include <linux/timecompare.h> #include <linux/net_tstamp.h> +#include <linux/bitops.h> +#include <linux/if_vlan.h> struct igb_adapter; @@ -252,7 +254,7 @@ static inline int igb_desc_unused(struct igb_ring *ring) struct igb_adapter { 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 wol; |