diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-08 16:15:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-08 16:47:38 -0500 |
| commit | fe6c791570efe717946ea7b7dd50aec96b70d551 (patch) | |
| tree | 1becb5e8aea7a9c9a7d78f987bd73b0a5d8ee434 /drivers/net/cxgb4 | |
| parent | f8bf5681cf15f77692c8ad8cb95d059ff7c622c9 (diff) | |
| parent | f19872575ff7819a3723154657a497d9bca66b33 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
net/llc/af_llc.c
Diffstat (limited to 'drivers/net/cxgb4')
| -rw-r--r-- | drivers/net/cxgb4/t4_hw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/cxgb4/t4_hw.c index bb813d94aea8..e97521c801ea 100644 --- a/drivers/net/cxgb4/t4_hw.c +++ b/drivers/net/cxgb4/t4_hw.c | |||
| @@ -2408,7 +2408,7 @@ int t4_alloc_mac_filt(struct adapter *adap, unsigned int mbox, | |||
| 2408 | if (index < NEXACT_MAC) | 2408 | if (index < NEXACT_MAC) |
| 2409 | ret++; | 2409 | ret++; |
| 2410 | else if (hash) | 2410 | else if (hash) |
| 2411 | *hash |= (1 << hash_mac_addr(addr[i])); | 2411 | *hash |= (1ULL << hash_mac_addr(addr[i])); |
| 2412 | } | 2412 | } |
| 2413 | return ret; | 2413 | return ret; |
| 2414 | } | 2414 | } |