diff options
| author | David S. Miller | 2011-03-04 06:27:42 +0100 |
|---|---|---|
| committer | David S. Miller | 2011-03-04 06:27:42 +0100 |
| commit | 0a0e9ae1bd788bc19adc4d4ae08c98b233697402 (patch) | |
| tree | 13825eeb5bbeae27d66e95f12168eff4b60701ab /drivers/net/igbvf | |
| parent | netlink: kill eff_cap from struct netlink_skb_parms (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
| download | kernel-qcow2-linux-0a0e9ae1bd788bc19adc4d4ae08c98b233697402.tar.gz kernel-qcow2-linux-0a0e9ae1bd788bc19adc4d4ae08c98b233697402.tar.xz kernel-qcow2-linux-0a0e9ae1bd788bc19adc4d4ae08c98b233697402.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
Diffstat (limited to 'drivers/net/igbvf')
| -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) * The parameter rar_count will usually be hw->mac.rar_entry_count * unless there are workarounds that change this. **/ -void e1000_update_mc_addr_list_vf(struct e1000_hw *hw, +static void e1000_update_mc_addr_list_vf(struct e1000_hw *hw, u8 *mc_addr_list, u32 mc_addr_count, u32 rar_used_count, u32 rar_count) { |