aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-07-27ks8842: Fix warnings on 64-bit.David S. Miller1-3/+3
drivers/net/ks8842.c:922:26: warning: cast from pointer to integer of different size drivers/net/ks8842.c:940:17: warning: cast to pointer from integer of different size drivers/net/ks8842.c:963:17: warning: cast to pointer from integer of different size Signed-off-by: David S. Miller <[email protected]>
2010-07-27e1000e: 82577/82578 PHY register access issuesBruce Allan1-1/+1
The MAC-PHY interconnect on 82577/82578 uses a power management feature (called K1) which must be disabled when in 1Gbps due to a hardware issue on these parts. The #define bit setting used to enable/disable K1 is incorrect and can cause PHY register accesses to stop working altogether until the next device reset. This patch sets the register correctly. This issue is present in kernels since 2.6.32. CC: [email protected] Signed-off-by: Bruce Allan <[email protected]> Tested-by: Jeff Pieper <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27macvlan: Fix rx counters update in macvlan_handle_frame()Sridhar Samudrala1-4/+7
Fix macvlan_handle_frame() to update the rx counters based on the return value of the vlan->receive call. Updated the patch to not do any packet count drops when the interface is down based on Herber'ts comments. Signed-off-by: Sridhar Samudrala <[email protected]> Acked-by: Herbert Xu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27Merge branch 'master' of ↵David S. Miller19-32/+147
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/bnx2x_main.c Merge bnx2x bug fixes in by hand... :-/ Signed-off-by: David S. Miller <[email protected]>
2010-07-27ixgbe: potential null dereferenceDan Carpenter1-3/+4
The e_dev_err() macro dereferences "adapter" which is NULL here. Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27ks8842: Support DMA when accessed via timberdaleRichard Röjfors2-21/+447
This patch adds support for RX and TX DMA via the DMA API, this is only supported when the KS8842 is accessed via timberdale. There is no support for DMA on the generic bus interface it self, a state machine inside the FPGA is handling RX and TX transfers to/from buffers in the FPGA. The host CPU can do DMA to and from these buffers. The FPGA has to handle the RX interrupts, so these must be enabled in the ks8842 but not in the FPGA. The driver must not disable the RX interrupt that would mean that the data transfers into the FPGA buffers would stop. The host shall not enable TX interrupts since TX is handled by the FPGA, the host is notified by DMA callbacks when transfers are finished. Which DMA channels to use are added as parameters in the platform data struct. Signed-off-by: Richard Röjfors <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27stmmac: fix automatic PAD/FCS strippingGiuseppe CAVALLARO4-4/+9
For Simple Ethernet frames (802.2 and 802.3) the GMAC Core never strips pad and fcs. This means the ACS has no effect on IPv4/6 frames. The FL bits, in the RDES0, include the FCS so the driver has to remove it in SW. For 802.3 frame format with LLC or LLC-SNAP, when set the ACS bit, the HW strips both PAD and FCS. The FL bits, in the RDES0, actually represents the frame length already stripped. This patch fixes this logic within the device driver that erroneously removed 4byte from 802.3 frames already stripped corrupting the payload. Signed-off-by: Giuseppe Cavallaro <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27stmmac: fix timer setup when use dual mac KconfigGiuseppe CAVALLARO1-1/+0
The driver erroneously sets the tmrate to zero when the TMU initialisation fails. This actually generates problems while using the dual GMAC configuration. With this patch, enabling both the dual gmac and the timer optimisation, the first interface opened will use the tmu channel 2, the second one won't be able to use the timer but will continue to work without mitigating the interrupts by using the external timer (i.e. TMU channel 2). Signed-off-by: Giuseppe Cavallaro <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27bnx2x: Update MAINTAINERS according to new locationDmitry Kravkov1-1/+1
Signed-off-by: Dmitry Kravkov <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27bnx2x: update driver version to 1.52.53-3Dmitry Kravkov1-1/+1
Signed-off-by: Dmitry Kravkov <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27bnx2x: Move statistics handling code to bnx2x_stats.*Dmitry Kravkov5-1594/+1647
Signed-off-by: Dmitry Kravkov <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27bnx2x: Create separate file for ethtool routinesDmitry Kravkov4-1955/+1986
Signed-off-by: Dmitry Kravkov <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27bnx2x: Create bnx2x_cmn.* filesDmitry Kravkov5-2600/+2943
Newly created files have no functionality changes, but includes some functionality from bnx2x_main.c which is common for PF and coming in the future VF driver. Signed-off-by: Dmitry Kravkov <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27bnx2x: move global variable load_count to bnx2x.hDmitry Kravkov2-3/+9
This will allow access to this global variable (used in no-mcp mode) from different object files. Signed-off-by: Dmitry Kravkov <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27bnx2x: store module parameters in driver main structureDmitry Kravkov2-3/+6
Store module parameters during initialization of main driver structure. This will allow access to the parameters from different files. Signed-off-by: Dmitry Kravkov <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27bnx2x: Create separate folder for bnx2x driverDmitry Kravkov14-6/+12
This commit includes files movement to newly created folder using git-mv command and fixes references in cnic and bnx2x code to each other. files moved using following: #!/bin/bash mkdir drivers/net/bnx2x/ list=$(cd drivers/net/ && ls bnx2x*.[ch]) for f in $list; do git mv -f drivers/net/$f drivers/net/bnx2x/$f done Signed-off-by: Dmitry Kravkov <[email protected]> Signed-off-by: Eilon Greenstein <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27Bluetooth: Fix kfree() => kfree_skb() in hci_ath.cDan Carpenter1-1/+1
sk_buffs have to be freed with kfree_skb() instead of kfree(). Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Gustavo F. Padovan <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2010-07-27igbvf, ixgbevf: use dev_hw_addr_randomStefan Assmann2-2/+2
Both igbvf and ixgbevf should set addr_assign_type to NET_ADDR_RANDOM so udev creates persistent net rules by matching the device path. Do this by using the dev_hw_addr_random helper function. Signed-off-by: Stefan Assmann <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27ixgbe: priority tagging FCoE frames without FCoE offloadJohn Fastabend1-21/+24
The DCB user priority for FCoE is available regardless of whether FCoE offload is enabled (IXGBE_FLAG_FCOE_ENABLED bit is set). This allows proper DCB user priority tagging for FCoE traffic on both 82598 and 82599 devices. Signed-off-by: Yi Zou <[email protected]> Signed-off-by: John Fastabend <[email protected]> Tested-by: Ross Brattain <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2010-07-27Bluetooth: Add __init and __exit marks to RFCOMMGustavo F. Padovan2-3/+3
Those annotation save memory and space on the binary. __init code is discarded just after execute and __exit code is discarded if the module is built into the kernel image or unload of modules is not allowed. Signed-off-by: Gustavo F. Padovan <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2010-07-27Bluetooth: Add __init and __exit marks to UART driversGustavo F. Padovan4-8/+8
Those marks are useful to save space in the binary and in the memory. Signed-off-by: Gustavo F. Padovan <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2010-07-27Bluetooth: Use hci_recv_stream_fragment() in UART driverGustavo F. Padovan1-101/+2
Use the new hci_recv_stream_fragment() to reassembly incoming UART streams. Signed-off-by: Gustavo F. Padovan <[email protected]> Tested-by: Ville Tervo <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2010-07-27Bluetooth: Test 'count' value before enter the loopGustavo F. Padovan1-4/+4
Testing first we avoid enter the loop when count = 0. Signed-off-by: Gustavo F. Padovan <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2010-07-27Bluetooth: Fix permission of hci_ath.cGustavo F. Padovan1-0/+0
.c file shall not have the 'x' permission. Signed-off-by: Gustavo F. Padovan <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2010-07-27Bluetooth: Defer SCO setup if mode change is pendingMarcel Holtmann3-20/+45
Certain headsets such as the Motorola H350 will reject SCO and eSCO connection requests while the ACL is transitioning from sniff mode to active mode. Add synchronization so that SCO and eSCO connection requests will wait until the ACL has fully transitioned to active mode. < HCI Command: Exit Sniff Mode (0x02|0x0004) plen 2 handle 12 > HCI Event: Command Status (0x0f) plen 4 Exit Sniff Mode (0x02|0x0004) status 0x00 ncmd 1 < HCI Command: Setup Synchronous Connection (0x01|0x0028) plen 17 handle 12 voice setting 0x0040 > HCI Event: Command Status (0x0f) plen 4 Setup Synchronous Connection (0x01|0x0028) status 0x00 ncmd 1 > HCI Event: Number of Completed Packets (0x13) plen 5 handle 12 packets 1 > HCI Event: Mode Change (0x14) plen 6 status 0x00 handle 12 mode 0x00 interval 0 Mode: Active > HCI Event: Synchronous Connect Complete (0x2c) plen 17 status 0x10 handle 14 bdaddr 00:1A:0E:50:28:A4 type SCO Error: Connection Accept Timeout Exceeded Signed-off-by: Ron Shaffer <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2010-07-27wireless: Convert wiphy_debug macro to functionJoe Perches2-2/+52
Save a few bytes of text (allyesconfig) $ size drivers/net/wireless/built-in.o* text data bss dec hex filename 3924568 100548 871056 4896172 4ab5ac drivers/net/wireless/built-in.o.new 3926520 100548 871464 4898532 4abee4 drivers/net/wireless/built-in.o.old $ size net/wireless/core.o* text data bss dec hex filename 12843 216 3768 16827 41bb net/wireless/core.o.new 12328 216 3656 16200 3f48 net/wireless/core.o Signed-off-by: Joe Perches <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27drivers/net/wireless/at76c50x-usb.c: Neaten macrosJoe Perches1-16/+13
Signed-off-by: Joe Perches <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27drivers/net/wireless: Use wiphy_<level>Joe Perches22-464/+398
Standardize the logging macros used. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27include/net/cfg80211.h: Add wiphy_<level> printk equivalentsJoe Perches1-1/+63
Simplify logging messages for wiphy devices Signed-off-by: Joe Perches <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: remove unused cmd_pending waitqDan Williams2-9/+0
Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: rename lbs_get_cmd_ctrl_node() to lbs_get_free_cmd_node()Dan Williams1-4/+2
Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: kill unused lbs_prepare_and_send_command()Dan Williams4-146/+9
Remove last bits of indirect command code. Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: convert DEEP_SLEEP timer to a direct commandDan Williams2-12/+8
Other uses were already used direct command paths. Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: convert PS_MODE to a direct commandDan Williams7-126/+95
Powersave looks like it got broken at some point but we'll fix that up when the command submission stuff is more understandable, which this series helps to do. That said, this patch should not further break powersave. Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: remove unused indirect command response handlerDan Williams1-24/+1
Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: convert CMD_FWT_ACCESS to a direct commandDan Williams5-34/+26
Slightly different approach here since there are so many arguments to the firmware command. Just let the caller fill them in before pushing the command to the firmware. Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: convert Mesh Blinding Table access to a direct commandDan Williams5-46/+158
Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: convert register access to direct commandsDan Williams6-180/+94
Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: convert LED_GPIO_CTRL to a direct commandDan Williams1-3/+2
Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: remove Beacon ControlDan Williams4-11/+2
For now; it's a pretty easy command to hook up and whenever OLPC figures out how they want the userspace interface to look (ie, not iwpriv commands) we can easily add it back in. Since the cfg80211 conversion it wasn't working anyway. Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: remove unused Automatic Frequency Control commandDan Williams3-23/+3
It hasn't been hooked up to anything in a long time and it's not even listed in any of the firmware documentation I have (and I have v5.1, v8, v9, and v10). Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: remove unused indirect TPC_CFG command leftoversDan Williams3-20/+0
These were no longer used but were left around; Transmit Power Control is done through the lbs_set_tpc_cfg() function. Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: convert 11D_DOMAIN_INFO to a direct commandDan Williams7-238/+139
Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: clean up RSSI commandDan Williams8-77/+51
Convert to a full direct command; previous code rolled a direct command by hand but left the original indirect command code intact but disabled. Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27libertas: clean up MONITOR_MODE commandDan Williams4-72/+33
Convert to a full direct command; previous code rolled a direct command by handle but left the original indirect command code lying around. Signed-off-by: Dan Williams <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27rt2500usb: disallow to set WEP key with non zero indexStanislaw Gruszka1-0/+8
On our hardware (050d:7050 Belkin Components F5D7050 Wireless G Adapter), setting any WEP key with non zero index, cause rx frames corruption. Note: perhaps (I did not check) this can be fixed differently - by using hw_key_idx the same as true MAC key index. But according to the comment in rt2x00mac_set_key(): "the hardware requires keys to be assigned in correct order (When key 1 is provided but key 0 is not, then the key is not found by the hardware during RX)" this will be quite problematic. Since WEP should not be used, disabling hardware crypto offload for it will not hurt much. Beside static one key WEP will still be offloaded. Signed-off-by: Stanislaw Gruszka <[email protected]> Acked-by: Ivo van Doorn <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27rt2500usb: truly disable encryption when initializeStanislaw Gruszka1-0/+1
Without cipher part nullify of TXRX_CSR0 register we can receive corrupted frames (removed IV or IVC), after reloading rt2500usb module with nohwcrypt=1 option, if previous some keys were configured into the hardware. Signed-off-by: Stanislaw Gruszka <[email protected]> Acked-by: Ivo van Doorn <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27rt2500usb: write keys to proper registersStanislaw Gruszka1-1/+1
Fix rt2500usb hardware encryption broken by commit 96b61bafe22b2f2abcc833d651739edb977f1b1e "rt2x00: Clean up USB vendor request buffer functions" Signed-off-by: Stanislaw Gruszka <[email protected]> Acked-by: Ivo van Doorn <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27ath9k: remove unused base_index from rate table.Senthil Balasubramanian2-161/+160
base index is not used anymore and so remove it. Signed-off-by: Senthil Balasubramanian <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-07-27ath9k: Fix incorrect user ratekbs of MCS15 ShortGISenthil Balasubramanian1-1/+1
The user ratekbs of MCS15 ShortGI is incorrect and can not be lesser than MCS15 rate. This incorrect rate may affect switching to higher rates as the rate control algorithm always finds MCS15 is better than MCS15 ShortGI and results in lower throughput. Fix this by feeding the correct user ratekbs for MCS15 ShortGI rate. This issue affects 3 stream case very badly as the 3 stream rates are not used at all once we scale down to MCS15 from 3 stream rates. Signed-off-by: Senthil Balasubramanian <[email protected]> Signed-off-by: John W. Linville <[email protected]>