diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 18:43:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 18:43:39 -0500 |
commit | 43ecb9a33ba8c93ebbda81d48ca05f0d1bbf9056 (patch) | |
tree | 28e4c9fa3ac800e2799d48e981a25f1403c4502e /include | |
parent | 58cba4650a7a414eabd2b40cc9d8e45fcdf192d9 (diff) | |
parent | 9f3f46b5fe83a56d380d4006dd2cd906bc186f91 (diff) |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/fsl_devices.h | 6 | ||||
-rw-r--r-- | include/linux/phy.h | 3 | ||||
-rw-r--r-- | include/net/ieee80211.h | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 934aa9bda481..a9f1cfd096ff 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h | |||
@@ -50,14 +50,12 @@ struct gianfar_platform_data { | |||
50 | 50 | ||
51 | /* board specific information */ | 51 | /* board specific information */ |
52 | u32 board_flags; | 52 | u32 board_flags; |
53 | const char *bus_id; | 53 | u32 bus_id; |
54 | u32 phy_id; | ||
54 | u8 mac_addr[6]; | 55 | u8 mac_addr[6]; |
55 | }; | 56 | }; |
56 | 57 | ||
57 | struct gianfar_mdio_data { | 58 | struct gianfar_mdio_data { |
58 | /* device specific information */ | ||
59 | u32 paddr; | ||
60 | |||
61 | /* board specific information */ | 59 | /* board specific information */ |
62 | int irq[32]; | 60 | int irq[32]; |
63 | }; | 61 | }; |
diff --git a/include/linux/phy.h b/include/linux/phy.h index 92a9696fdebe..331521a10a2d 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h | |||
@@ -53,6 +53,9 @@ | |||
53 | 53 | ||
54 | #define PHY_MAX_ADDR 32 | 54 | #define PHY_MAX_ADDR 32 |
55 | 55 | ||
56 | /* Used when trying to connect to a specific phy (mii bus id:phy device id) */ | ||
57 | #define PHY_ID_FMT "%x:%02x" | ||
58 | |||
56 | /* The Bus class for PHYs. Devices which provide access to | 59 | /* The Bus class for PHYs. Devices which provide access to |
57 | * PHYs should register using this structure */ | 60 | * PHYs should register using this structure */ |
58 | struct mii_bus { | 61 | struct mii_bus { |
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index cde2f4f4f501..df05f468fa5c 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h | |||
@@ -363,8 +363,9 @@ enum ieee80211_reasoncode { | |||
363 | #define IEEE80211_OFDM_SHIFT_MASK_A 4 | 363 | #define IEEE80211_OFDM_SHIFT_MASK_A 4 |
364 | 364 | ||
365 | /* NOTE: This data is for statistical purposes; not all hardware provides this | 365 | /* NOTE: This data is for statistical purposes; not all hardware provides this |
366 | * information for frames received. Not setting these will not cause | 366 | * information for frames received. |
367 | * any adverse affects. */ | 367 | * For ieee80211_rx_mgt, you need to set at least the 'len' parameter. |
368 | */ | ||
368 | struct ieee80211_rx_stats { | 369 | struct ieee80211_rx_stats { |
369 | u32 mac_time; | 370 | u32 mac_time; |
370 | s8 rssi; | 371 | s8 rssi; |
@@ -1088,6 +1089,7 @@ extern int ieee80211_tx_frame(struct ieee80211_device *ieee, | |||
1088 | /* ieee80211_rx.c */ | 1089 | /* ieee80211_rx.c */ |
1089 | extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | 1090 | extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, |
1090 | struct ieee80211_rx_stats *rx_stats); | 1091 | struct ieee80211_rx_stats *rx_stats); |
1092 | /* make sure to set stats->len */ | ||
1091 | extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, | 1093 | extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, |
1092 | struct ieee80211_hdr_4addr *header, | 1094 | struct ieee80211_hdr_4addr *header, |
1093 | struct ieee80211_rx_stats *stats); | 1095 | struct ieee80211_rx_stats *stats); |