diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-27 21:35:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-27 21:35:03 -0400 |
commit | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (patch) | |
tree | 357258d77e2153ef7409926773655c5f8775a1f3 /drivers/net/ac3200.c | |
parent | 7b616c8a2f5c8507b4aed6907336ec5b85803a39 (diff) | |
parent | 0870352bc6e0dee485c86a0c99dd60e7089c8917 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (166 commits)
Revert "ax25: zero length frame filtering in AX25"
Revert "netrom: zero length frame filtering in NetRom"
cfg80211: default CONFIG_WIRELESS_OLD_REGULATORY to n
mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifi
mac80211: fix aggregation to not require queue stop
mac80211: add skb length sanity checking
mac80211: unify and fix TX aggregation start
mac80211: clean up __ieee80211_tx args
mac80211: rework the pending packets code
mac80211: fix A-MPDU queue assignment
mac80211: rewrite fragmentation
iwlwifi: show current driver status in user readable format
b43: Add BCM4307 PCI-ID
cfg80211: fix locking in nl80211_set_wiphy
mac80211: fix RX path
ath5k: properly drop packets from ops->tx
ar9170: single module build
ath9k: fix dma mapping leak of rx buffer upon rmmod
rt2x00: New USB ID for rt73usb
ath5k: warn and correct rate for unknown hw rate indexes
...
Diffstat (limited to 'drivers/net/ac3200.c')
-rw-r--r-- | drivers/net/ac3200.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c index 071a851a2ea1..eac73382c087 100644 --- a/drivers/net/ac3200.c +++ b/drivers/net/ac3200.c | |||
@@ -143,6 +143,22 @@ out: | |||
143 | } | 143 | } |
144 | #endif | 144 | #endif |
145 | 145 | ||
146 | static const struct net_device_ops ac_netdev_ops = { | ||
147 | .ndo_open = ac_open, | ||
148 | .ndo_stop = ac_close_card, | ||
149 | |||
150 | .ndo_start_xmit = ei_start_xmit, | ||
151 | .ndo_tx_timeout = ei_tx_timeout, | ||
152 | .ndo_get_stats = ei_get_stats, | ||
153 | .ndo_set_multicast_list = ei_set_multicast_list, | ||
154 | .ndo_validate_addr = eth_validate_addr, | ||
155 | .ndo_set_mac_address = eth_mac_addr, | ||
156 | .ndo_change_mtu = eth_change_mtu, | ||
157 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
158 | .ndo_poll_controller = ei_poll, | ||
159 | #endif | ||
160 | }; | ||
161 | |||
146 | static int __init ac_probe1(int ioaddr, struct net_device *dev) | 162 | static int __init ac_probe1(int ioaddr, struct net_device *dev) |
147 | { | 163 | { |
148 | int i, retval; | 164 | int i, retval; |
@@ -253,11 +269,7 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev) | |||
253 | ei_status.block_output = &ac_block_output; | 269 | ei_status.block_output = &ac_block_output; |
254 | ei_status.get_8390_hdr = &ac_get_8390_hdr; | 270 | ei_status.get_8390_hdr = &ac_get_8390_hdr; |
255 | 271 | ||
256 | dev->open = &ac_open; | 272 | dev->netdev_ops = &ac_netdev_ops; |
257 | dev->stop = &ac_close_card; | ||
258 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
259 | dev->poll_controller = ei_poll; | ||
260 | #endif | ||
261 | NS8390_init(dev, 0); | 273 | NS8390_init(dev, 0); |
262 | 274 | ||
263 | retval = register_netdev(dev); | 275 | retval = register_netdev(dev); |