diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-15 05:30:17 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-15 05:30:17 (GMT) |
commit | 925068dcdc746236264d1877d3d5df656e87882a (patch) | |
tree | dc7615e1e87a1ca26ee31510c240a1c85fb6f1ad /drivers/net/igb/e1000_mac.c | |
parent | 83aa2e964b9b04effa304aaf3c1090b46812a04b (diff) | |
parent | 67fbbe1551b24d1bcab8478407f9b8c713d5596e (diff) | |
download | linux-fsl-qoriq-925068dcdc746236264d1877d3d5df656e87882a.tar.xz |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/igb/e1000_mac.c')
-rw-r--r-- | drivers/net/igb/e1000_mac.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/igb/e1000_mac.c b/drivers/net/igb/e1000_mac.c index 47ad2c4..20408aa 100644 --- a/drivers/net/igb/e1000_mac.c +++ b/drivers/net/igb/e1000_mac.c @@ -36,7 +36,6 @@ static s32 igb_set_default_fc(struct e1000_hw *hw); static s32 igb_set_fc_watermarks(struct e1000_hw *hw); -static u32 igb_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr); /** * igb_remove_device - Free device specific structure @@ -360,7 +359,7 @@ void igb_update_mc_addr_list(struct e1000_hw *hw, * the multicast filter table array address and new table value. See * igb_mta_set() **/ -static u32 igb_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr) +u32 igb_hash_mc_addr(struct e1000_hw *hw, u8 *mc_addr) { u32 hash_value, hash_mask; u8 bit_shift = 0; |