diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-06 20:42:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-06 20:42:02 -0400 |
| commit | eedc765ca4b19a41cf0b921a492ac08d640060d1 (patch) | |
| tree | 95c566c6238cc953e1e336115d2daafe8bcb388f /drivers/net/sfc/net_driver.h | |
| parent | e59d44df46edaafb6b637e98d046775524b31104 (diff) | |
| parent | 024a07bacf8287a6ddfa83e9d5b951c5e8b4070e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/net_driver.h
drivers/net/sfc/siena.c
Diffstat (limited to 'drivers/net/sfc/net_driver.h')
| -rw-r--r-- | drivers/net/sfc/net_driver.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index 6b2e4402ec57..ba636e086fc3 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h | |||
| @@ -836,7 +836,7 @@ static inline const char *efx_dev_name(struct efx_nic *efx) | |||
| 836 | 836 | ||
| 837 | static inline unsigned int efx_port_num(struct efx_nic *efx) | 837 | static inline unsigned int efx_port_num(struct efx_nic *efx) |
| 838 | { | 838 | { |
| 839 | return efx->port_num; | 839 | return efx->net_dev->dev_id; |
| 840 | } | 840 | } |
| 841 | 841 | ||
| 842 | /** | 842 | /** |