diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-02 18:06:01 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-02 18:06:01 -0500 |
| commit | 1707be1be18deb1deaecd768135290cffdeb0e8e (patch) | |
| tree | 72c4c01b1797d3570c1037a9ad2514170afc1d00 /drivers/net/igbvf/vf.c | |
| parent | f3d7bc57c71eba3f279785111bb473b1ef68dcb6 (diff) | |
| parent | 4def99bbfd46e05c5e03b5b282cb4ee30e27ff19 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6
Diffstat (limited to 'drivers/net/igbvf/vf.c')
| -rw-r--r-- | drivers/net/igbvf/vf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/igbvf/vf.c b/drivers/net/igbvf/vf.c index 74486a8b009a..af3822f9ea9a 100644 --- a/drivers/net/igbvf/vf.c +++ b/drivers/net/igbvf/vf.c | |||
| @@ -220,7 +220,7 @@ static u32 e1000_hash_mc_addr_vf(struct e1000_hw *hw, u8 *mc_addr) | |||
| 220 | * The parameter rar_count will usually be hw->mac.rar_entry_count | 220 | * The parameter rar_count will usually be hw->mac.rar_entry_count |
| 221 | * unless there are workarounds that change this. | 221 | * unless there are workarounds that change this. |
| 222 | **/ | 222 | **/ |
| 223 | void e1000_update_mc_addr_list_vf(struct e1000_hw *hw, | 223 | static void e1000_update_mc_addr_list_vf(struct e1000_hw *hw, |
| 224 | u8 *mc_addr_list, u32 mc_addr_count, | 224 | u8 *mc_addr_list, u32 mc_addr_count, |
| 225 | u32 rar_used_count, u32 rar_count) | 225 | u32 rar_used_count, u32 rar_count) |
| 226 | { | 226 | { |