diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-29 12:41:32 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-29 12:41:32 +0400 |
| commit | 3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148 (patch) | |
| tree | 785e5d697e9c2e4b8fd012a7e9c8aac263c186a5 /drivers/net/wimax/i2400m/i2400m.h | |
| parent | dfe9a837987aacaffbce020fbf54d8e0afa4bde1 (diff) | |
| parent | 7481806dcfd07e9a636155554f6f4b4fbd976381 (diff) | |
| download | linux-3f1f39c42b24d5c20eb593ce80b9c4d5ec1e2148.tar.xz | |
Merge branch 'linux-2.6.31.y' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
Diffstat (limited to 'drivers/net/wimax/i2400m/i2400m.h')
| -rw-r--r-- | drivers/net/wimax/i2400m/i2400m.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h index 3ae2df38b59a..434ba310c2fe 100644 --- a/drivers/net/wimax/i2400m/i2400m.h +++ b/drivers/net/wimax/i2400m/i2400m.h @@ -323,6 +323,10 @@ struct i2400m_roq; * delivered. Then the driver can release them to the host. See * drivers/net/i2400m/rx.c for details. * + * @src_mac_addr: MAC address used to make ethernet packets be coming + * from. This is generated at i2400m_setup() time and used during + * the life cycle of the instance. See i2400m_fake_eth_header(). + * * @init_mutex: Mutex used for serializing the device bringup * sequence; this way if the device reboots in the middle, we * don't try to do a bringup again while we are tearing down the @@ -421,6 +425,7 @@ struct i2400m { unsigned rx_pl_num, rx_pl_max, rx_pl_min, rx_num, rx_size_acc, rx_size_min, rx_size_max; struct i2400m_roq *rx_roq; /* not under rx_lock! */ + u8 src_mac_addr[ETH_HLEN]; struct mutex msg_mutex; /* serialize command execution */ struct completion msg_completion; |