* Re: [PATCH] atm: iphase: Fix set-but-not-used warnings.
From: David Miller @ 2011-04-12 23:11 UTC (permalink / raw)
To: netdev
In-Reply-To: <20110412.161047.233699167.davem@davemloft.net>
From: David Miller <davem@davemloft.net>
Date: Tue, 12 Apr 2011 16:10:47 -0700 (PDT)
>
> The "iavcc" case is obvious.
>
> The intr_status and frmr_intr cases are reading a register to clear
> the chip status. This driver is pretty old and creaky, and uses
> volatile pointer dereferences to do register I/O when it should be
> using readl() and friends. However that it outside of the scope of
> these changes.
>
> Signed-off-by: David S. Miller <davem@davemloft.net>
Hmmm, I missed a few more cases, updated patch coming up.
^ permalink raw reply
* [PATCH] atm: iphase: Fix set-but-not-used warnings.
From: David Miller @ 2011-04-12 23:10 UTC (permalink / raw)
To: netdev
The "iavcc" case is obvious.
The intr_status and frmr_intr cases are reading a register to clear
the chip status. This driver is pretty old and creaky, and uses
volatile pointer dereferences to do register I/O when it should be
using readl() and friends. However that it outside of the scope of
these changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
drivers/atm/iphase.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 1c674a9..bb7e139 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -613,7 +613,6 @@ static int ia_que_tx (IADEV *iadev) {
struct sk_buff *skb;
int num_desc;
struct atm_vcc *vcc;
- struct ia_vcc *iavcc;
num_desc = ia_avail_descs(iadev);
while (num_desc && (skb = skb_dequeue(&iadev->tx_backlog))) {
@@ -627,7 +626,6 @@ static int ia_que_tx (IADEV *iadev) {
printk("Free the SKB on closed vci %d \n", vcc->vci);
break;
}
- iavcc = INPH_IA_VCC(vcc);
if (ia_pkt_tx (vcc, skb)) {
skb_queue_head(&iadev->tx_backlog, skb);
}
@@ -823,8 +821,6 @@ static void IaFrontEndIntr(IADEV *iadev) {
volatile IA_SUNI *suni;
volatile ia_mb25_t *mb25;
volatile suni_pm7345_t *suni_pm7345;
- u32 intr_status;
- u_int frmr_intr;
if(iadev->phy_type & FE_25MBIT_PHY) {
mb25 = (ia_mb25_t*)iadev->phy;
@@ -832,18 +828,18 @@ static void IaFrontEndIntr(IADEV *iadev) {
} else if (iadev->phy_type & FE_DS3_PHY) {
suni_pm7345 = (suni_pm7345_t *)iadev->phy;
/* clear FRMR interrupts */
- frmr_intr = suni_pm7345->suni_ds3_frm_intr_stat;
+ (void) suni_pm7345->suni_ds3_frm_intr_stat;
iadev->carrier_detect =
Boolean(!(suni_pm7345->suni_ds3_frm_stat & SUNI_DS3_LOSV));
} else if (iadev->phy_type & FE_E3_PHY ) {
suni_pm7345 = (suni_pm7345_t *)iadev->phy;
- frmr_intr = suni_pm7345->suni_e3_frm_maint_intr_ind;
+ (void) suni_pm7345->suni_e3_frm_maint_intr_ind;
iadev->carrier_detect =
Boolean(!(suni_pm7345->suni_e3_frm_fram_intr_ind_stat&SUNI_E3_LOS));
}
else {
suni = (IA_SUNI *)iadev->phy;
- intr_status = suni->suni_rsop_status & 0xff;
+ (void) suni->suni_rsop_status;
iadev->carrier_detect = Boolean(!(suni->suni_rsop_status & SUNI_LOSV));
}
if (iadev->carrier_detect)
--
1.7.4.3
^ permalink raw reply related
* pull request: wireless-next-2.6 2011-04-12
From: John W. Linville @ 2011-04-12 21:14 UTC (permalink / raw)
To: davem; +Cc: linux-wireless, netdev
David,
Here is the first big wireless pull request for the 2.6.40 cycle...
There is the usual contingent of patches from the iwlwifi team, the
ath9k team, the rt2x00 team, the mwl8k guys and now the Bluetooth guys
as well. Also of note are the addition of the mwifiex driver from
Marvell and the removal of the ar9170usb driver which has been
obsoleted by carl9170. There are a number of other smaller
contributions too, of course.
Please let me know if there are problems!
Thanks,
John
---
The following changes since commit 6ba1037c3d871ab70e342631516dbf841c35b086:
vxge: update driver version (2011-04-12 11:22:34 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git for-davem
Alexey Dobriyan (1):
Bluetooth: convert net/bluetooth/ to kstrtox
Amitkumar Karwar (1):
mwifiex: return success in set_default_key for WPA/WPA2
Andrei Emeltchenko (2):
Bluetooth: check L2CAP info_rsp ident and state
Bluetooth: delete hanging L2CAP channel
Ben Greear (1):
wifi: Add hwflags to debugfs.
Bing Zhao (6):
wireless: mwifiex: initial commit for Marvell mwifiex driver
mwifiex: remove macro SHORT_SLOT_TIME_DISABLED
mwifiex: remove MWIFIEX_BSS_MODE_ macros
ieee80211: add HT extended capabilities masks
mwifiex: remove struct mwifiex_802_11_fixed_ies
mwifiex: remove unused macros in decl.h and main.h
Brian Cavagnolo (4):
mwl8k: refactor in preparation for APIv2 update
mwl8k: update to ap firmware API version 2
mwl8k: differentiate between WMM queues and AMPDU queues
mwl8k: add internal API for managing AMPDU streams
Christian Lamparter (1):
ar9170usb: purge obsolete driver
Dan Carpenter (1):
iwlwifi: remove duplicate initialization in __iwl_down()
Daniel Halperin (4):
iwlwifi: limit number of attempts for highest HT rate
iwlwifi: cleanup and bugfix tx aggregation code
iwlwifi: add RATE_MCS_RATE_MSK
iwlwifi: set default aggregation frame limit to 63
Felix Fietkau (24):
ath9k: remove unnecessary debugfs return code checks
ath9k: add an interface for overriding the value of specific GPIO pins
ath9k: add support for overriding the MAC address through platform data
ath9k: add support for overriding LED pin and GPIO settings from platform data
ath9k_hw: enable a BlockAck related fixup specific to AR9100
ath9k_hw: force rx chainmask to 7 on AR9100
ath9k: remove the pending frames ath_txq_schedule workaround
ath9k: fix beacon timer handling issues
ath9k: trigger nfcal only after multiple missed beacons in AP mode
ath9k: fix stuck beacon detection
ath9k_hw: embed the ath_ops callbacks in the ath_hw struct
ath9k_hw: add a new register op for read-mask-write
ath9k_hw: replace REG_READ+REG_WRITE with REG_RMW
ath9k_hw: turn a few big macros into functions
ath9k_hw: remove pCap->total_queues
ath9k_hw: remove ah->config.ht_enable
ath9k_hw: remove pCap->reg_cap
ath9k_hw: remove pCap->keycache_size
ath9k_hw: remove ATH9K_HW_CAP_ENHANCEDPM
ath9k_hw: remove pCap->tx_triglevel_max
mac80211: fix suppressing probe responses in ad-hoc mode
mac80211: remove the dependency on crypto_blkcipher
ath9k: fix beacon slot processing in ad-hoc mode
ath9k: use the hw opmode to select the beacon timer mode
Gustavo F. Padovan (10):
Bluetooth: remove unnecessary function declaration
Bluetooth: Remove unused struct item
Bluetooth: Improve error message on wrong link type
Bluetooth: Remove unused struct l2cap_conn item
Bluetooth: Move bt_accept_enqueue() to outside __l2cap_chan_add
Bluetooth: Fix HCI_RESET command synchronization
Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6
Bluetooth: Remove gfp_mask param from hci_reassembly()
Bluetooth: Don't use spin_lock_bh in user context
Bluetooth: Use GFP_KERNEL in user context
Helmut Schaa (13):
mac80211: Minor optimization in tx status handling
rt2x00: Limit rt2x00pci rxdone processing to 16 entries at once
rt2x00: Limit rt2800pci txdone processing to 16 entries at once
rt2x00: Calculate tx status fifo size instead of hardcoding it
rt2x00: Remove DRIVER_SUPPORT_WATCHDOG flag
rt2x00: Restructure bw_comp calculation
rt2x00: Don't recalculate HT40 compensation for each rate
rt2x00: Indention cleanup in rt2800lib
rt2x00: Remove obsolete rt2x00queue_align_payload
rt2x00: Implement tx power temperature compensation
rt2x00: Fix STBC transmissions to STAs with Rx STBC > 1
rt2x00: Fix tx aggregation problems with some clients
rt2x00: Add an error message when trying to send on a full queue
Ivo van Doorn (1):
rt2x00: Add support for the ZyXEL NWD-211AN USB
Jarkko Nikula (2):
wl1251: Prepare for idle mode support
wl1251: Add support for idle mode
Johan Hedberg (7):
Bluetooth: Add define for the maximum name length on HCI level
Bluetooth: mgmt: Add local name information to read_info reply
Bluetooth: mgmt: Add support for setting the local name
Bluetooth: Add local Extended Inquiry Response (EIR) support
Bluetooth: Fix missing hci_dev_lock_bh in user_confirm_reply
Bluetooth: Add mgmt_device_found event
Bluetooth: Add mgmt_remote_name event
Johannes Berg (25):
iwlagn: clean up TX aggregation code
iwlagn: fix aggregation queue scheduler setup
mac80211: add comment about reordering
mac80211: clean up station cleanup timer
iwlagn: remove unused variable
iwlagn: clean up some 3945/4965 remnants
iwlagn: make mac80211 handlers static
iwlagn: clean up ucode loading
iwlagn: remove pointless return variables
iwlagn: simplify ucode check code
iwlagn: verify specific ucode
iwlagn: remove bootstrap code
iwlagn: centralize and fix ucode restart
iwlagn: remove ucode_data_backup
iwlagn: add feature flags
iwlagn: fix ucode verify message
iwlagn: clean up alive handling
iwlagn: init cmd_queue earlier
iwlagn: remove BSM clock setting
iwlagn: remove hw_wa_rev
iwlagn: remove hw_rev
iwlagn: remove rev_id
iwlagn: remove rxb page bookkeeping
iwlagn: remove ISR ops
iwlagn: move IO functions out of line
John W. Linville (4):
Merge branch 'wireless-next-2.6' of git://git.kernel.org/.../iwlwifi/iwlwifi-2.6
Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-next-2.6
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next-2.6 into for-davem
Jouni Malinen (2):
ath9k: Support RSN IBSS
cfg80211: Add nl80211 event for deletion of a station entry
Jussi Kivilinna (1):
zd1211rw: rename CR* macros to ZD_CR*
Larry Finger (2):
rtlwifi: rtl8192c{e,u}: Remove some extraneous casts on memcpy commands
rtlwifi: Remove unused/unneeded variables
Luis R. Rodriguez (3):
ath9k_hw: remove AR9485 1.0 support
cfg80211: fix regulatory restore upon user hints
cfg80211: add a timer for invalid user reg hints
Marc Yang (6):
mwifiex: remove unnecessary _set_auth functions
mwifiex: use IEEE80211_HT_CAP_ macros for 11n cap_info
mwifiex: remove MWIFIEX_AUTH_MODE_ macros
mwifiex: remove unused radio_on variable and macros
mwifiex: remove unused macros in fw.h
mwifiex: cleanup power save related struct and macros
Marc-Antoine Perennou (1):
Bluetooth: add support for Apple MacBook Pro 8,2
Michal Marek (1):
rt2x00: Drop __TIME__ usage
Mohammed Shafi Shajakhan (4):
ath9k: cleanup few redundant macros
ath9k: remove set11n_virtualmorefrag
ath9k_hw: remove ath9k_get_channel_edges
mac80211: remove few obsolete flags
Nishant Sarmukadam (6):
mwl8k: add support for block ack commands
mwl8k: Initiate BA sessions
mwl8k: Handle the watchdog event from the firmware
mwl8k: Check outgoing rate for a station to decide if ampdu can be created
mwl8k: Queue ADDBA requests in respective data queues
mwl8k: Do not configure tx power unconditionally
Paul Stewart (1):
nl80211: Add BSS parameters to station
Rafał Miłecki (5):
ssb: trivial: use u8 for chip_rev (it's mask is 0xF)
ssb: pci: trivial: drop useless pointer
ssb: pci: fix mdio writes on newer cores (rev 10+)
ssb: pci: implement mdio reading
ssb: pci: implement serdes workaround
Rajkumar Manoharan (8):
ath9k_htc: Fix LED pin for AR9287 HTC device
ath9k_hw: Fix throughput drops in HT40 mode for AR9287 chips
ath: Speedup key set/reset ops for HTC driver
ath9k_hw: Speedup register ops for HTC driver
ath9k: deny new interface addtion on IBSS mode
ath9k: Cleanup ath_vif struct
ath9k: Handle BSSID/AID for multiple interfaces
Stanislaw Gruszka (4):
iwlegacy: MAINTAINERS
iwlwifi: fix enqueue hcmd race conditions
iwlwifi: more priv->mutex serialization
iwlwifi: remove sync_cmd_mutex
Suraj Sumangala (1):
Bluetooth: Increment unacked_frames count only the first transmit
Szymon Janc (15):
Bluetooth: Opencode macros in bnep/core.c
Bluetooth: Fix checkpatch errors and some code style issues in bnep
Bluetooth: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
Bluetooth: Fix checkpatch errors, code style issues and typos in hidp
Bluetooth: Do not use assignments in IF conditions
Bluetooth: Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
Bluetooth: Fix checkpatch error in cmtp.h
Bluetooth: Rename cmd to param in pending_cmd
Bluetooth: Allow for NULL data in mgmt_pending_add
Bluetooth: Add read_local_oob_data management command
Bluetooth: Add add/remove_remote_oob_data management commands
Bluetooth: Enable support for out of band association model
Bluetooth: Use kthread API in hidp
Bluetooth: Use kthread API in bnep
Bluetooth: Use kthread API in cmtp
Thomas Gleixner (1):
Bluetooth: Fix warning with hci_cmd_timer
Vasanthakumar Thiagarajan (1):
ath9k_hw: Use appropriate rx gain table for AR9485
Vasily Khoruzhick (1):
libertas_spi: Add support for suspend/resume
Vinicius Costa Gomes (1):
Bluetooth: Fix sending LE data over USB
Wey-Yi Guy (10):
iwlegacy: MAINTAINERS
iwlagn: use 6030 configuration for 6035 series
iwlwifi: remove legacy isr tasklet
iwlagn: remove 3945 only station code
iwlagn: remove reference to 3945 and 4965
iwlagn: remove deprecated module parameters
iwlagn: remove more 3945/4965 related defines
iwlagn: return send calibration result
iwlagn: change Copyright to 2011
iwlagn: check more error return code
Xose Vazquez Perez (1):
wireless: rt2x00: rt{2500,73}usb.c fix duplicate ids
Yogesh Ashok Powar (2):
mwifiex: remove helper functions for displaying 11n capabilities
mwifiex: remove redundant encryption_mode mapping
Documentation/feature-removal-schedule.txt | 11 -
MAINTAINERS | 13 +-
drivers/net/wireless/Kconfig | 1 +
drivers/net/wireless/Makefile | 2 +
drivers/net/wireless/ath/Kconfig | 1 -
drivers/net/wireless/ath/Makefile | 1 -
drivers/net/wireless/ath/ar9170/Kconfig | 20 -
drivers/net/wireless/ath/ar9170/Makefile | 3 -
drivers/net/wireless/ath/ar9170/ar9170.h | 258 --
drivers/net/wireless/ath/ar9170/cmd.c | 127 -
drivers/net/wireless/ath/ar9170/cmd.h | 92 -
drivers/net/wireless/ath/ar9170/eeprom.h | 179 --
drivers/net/wireless/ath/ar9170/hw.h | 430 ---
drivers/net/wireless/ath/ar9170/led.c | 181 --
drivers/net/wireless/ath/ar9170/mac.c | 519 ----
drivers/net/wireless/ath/ar9170/main.c | 2190 ---------------
drivers/net/wireless/ath/ar9170/phy.c | 1719 ------------
drivers/net/wireless/ath/ar9170/usb.c | 1008 -------
drivers/net/wireless/ath/ar9170/usb.h | 82 -
drivers/net/wireless/ath/ath.h | 1 +
drivers/net/wireless/ath/ath9k/ar5008_phy.c | 45 +-
drivers/net/wireless/ath/ath9k/ar9002_calib.c | 43 +-
drivers/net/wireless/ath/ath9k/ar9002_mac.c | 12 -
drivers/net/wireless/ath/ath9k/ar9003_hw.c | 98 +-
drivers/net/wireless/ath/ath9k/ar9003_mac.c | 12 -
drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 925 ------
drivers/net/wireless/ath/ath9k/ath9k.h | 14 +-
drivers/net/wireless/ath/ath9k/beacon.c | 207 +-
drivers/net/wireless/ath/ath9k/common.c | 2 +-
drivers/net/wireless/ath/ath9k/debug.c | 94 +-
drivers/net/wireless/ath/ath9k/eeprom_9287.c | 6 +
drivers/net/wireless/ath/ath9k/eeprom_def.c | 7 +
drivers/net/wireless/ath/ath9k/gpio.c | 14 +-
drivers/net/wireless/ath/ath9k/htc.h | 2 +-
drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 9 +-
drivers/net/wireless/ath/ath9k/htc_drv_init.c | 33 +-
drivers/net/wireless/ath/ath9k/hw-ops.h | 6 -
drivers/net/wireless/ath/ath9k/hw.c | 206 +-
drivers/net/wireless/ath/ath9k/hw.h | 66 +-
drivers/net/wireless/ath/ath9k/init.c | 53 +-
drivers/net/wireless/ath/ath9k/mac.c | 113 +-
drivers/net/wireless/ath/ath9k/main.c | 175 +-
drivers/net/wireless/ath/ath9k/phy.h | 14 -
drivers/net/wireless/ath/ath9k/recv.c | 2 +-
drivers/net/wireless/ath/ath9k/reg.h | 1 +
drivers/net/wireless/ath/ath9k/xmit.c | 29 +-
drivers/net/wireless/ath/key.c | 32 +
drivers/net/wireless/iwlwifi/Makefile | 2 +-
drivers/net/wireless/iwlwifi/iwl-1000.c | 16 +-
drivers/net/wireless/iwlwifi/iwl-2000.c | 48 +-
drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 4 +-
drivers/net/wireless/iwlwifi/iwl-5000.c | 29 +-
drivers/net/wireless/iwlwifi/iwl-6000-hw.h | 4 +-
drivers/net/wireless/iwlwifi/iwl-6000.c | 46 +-
drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 4 +-
drivers/net/wireless/iwlwifi/iwl-agn-calib.h | 4 +-
drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 52 +-
drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 6 +-
drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 4 +-
drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 4 +-
drivers/net/wireless/iwlwifi/iwl-agn-led.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn-led.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 6 +-
drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 29 +-
drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 30 +-
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 4 +-
drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn-tt.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 142 +-
drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 122 +-
drivers/net/wireless/iwlwifi/iwl-agn.c | 529 +---
drivers/net/wireless/iwlwifi/iwl-agn.h | 45 +-
drivers/net/wireless/iwlwifi/iwl-commands.h | 647 +-----
drivers/net/wireless/iwlwifi/iwl-core.c | 114 +-
drivers/net/wireless/iwlwifi/iwl-core.h | 40 +-
drivers/net/wireless/iwlwifi/iwl-csr.h | 43 +-
drivers/net/wireless/iwlwifi/iwl-debug.h | 4 +-
drivers/net/wireless/iwlwifi/iwl-debugfs.c | 9 +-
drivers/net/wireless/iwlwifi/iwl-dev.h | 274 +--
drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-eeprom.c | 50 +-
drivers/net/wireless/iwlwifi/iwl-eeprom.h | 191 +--
drivers/net/wireless/iwlwifi/iwl-fh.h | 4 +-
drivers/net/wireless/iwlwifi/iwl-hcmd.c | 17 +-
drivers/net/wireless/iwlwifi/iwl-helpers.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-io.c | 274 ++
drivers/net/wireless/iwlwifi/iwl-io.h | 491 +----
drivers/net/wireless/iwlwifi/iwl-led.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-led.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-power.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-power.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-prph.h | 342 +---
drivers/net/wireless/iwlwifi/iwl-rx.c | 13 +-
drivers/net/wireless/iwlwifi/iwl-scan.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-spectrum.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-sta.c | 9 +-
drivers/net/wireless/iwlwifi/iwl-sta.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-tx.c | 68 +-
drivers/net/wireless/libertas/if_spi.c | 65 +
drivers/net/wireless/mwifiex/11n.c | 809 ++++++
drivers/net/wireless/mwifiex/11n.h | 176 ++
drivers/net/wireless/mwifiex/11n_aggr.c | 423 +++
drivers/net/wireless/mwifiex/11n_aggr.h | 32 +
drivers/net/wireless/mwifiex/11n_rxreorder.c | 637 +++++
drivers/net/wireless/mwifiex/11n_rxreorder.h | 67 +
drivers/net/wireless/mwifiex/Kconfig | 21 +
drivers/net/wireless/mwifiex/Makefile | 41 +
drivers/net/wireless/mwifiex/README | 204 ++
drivers/net/wireless/mwifiex/cfg80211.c | 1456 ++++++++++
drivers/net/wireless/mwifiex/cfg80211.h | 31 +
drivers/net/wireless/mwifiex/cfp.c | 367 +++
drivers/net/wireless/mwifiex/cmdevt.c | 1459 ++++++++++
drivers/net/wireless/mwifiex/debugfs.c | 773 +++++
drivers/net/wireless/mwifiex/decl.h | 153 +
drivers/net/wireless/mwifiex/fw.h | 1229 ++++++++
drivers/net/wireless/mwifiex/init.c | 662 +++++
drivers/net/wireless/mwifiex/ioctl.h | 411 +++
drivers/net/wireless/mwifiex/join.c | 1462 ++++++++++
drivers/net/wireless/mwifiex/main.c | 1102 ++++++++
drivers/net/wireless/mwifiex/main.h | 1058 +++++++
drivers/net/wireless/mwifiex/scan.c | 3097 +++++++++++++++++++++
drivers/net/wireless/mwifiex/sdio.c | 1770 ++++++++++++
drivers/net/wireless/mwifiex/sdio.h | 305 ++
drivers/net/wireless/mwifiex/sta_cmd.c | 1226 ++++++++
drivers/net/wireless/mwifiex/sta_cmdresp.c | 983 +++++++
drivers/net/wireless/mwifiex/sta_event.c | 405 +++
drivers/net/wireless/mwifiex/sta_ioctl.c | 2360 ++++++++++++++++
drivers/net/wireless/mwifiex/sta_rx.c | 182 ++
drivers/net/wireless/mwifiex/sta_tx.c | 202 ++
drivers/net/wireless/mwifiex/txrx.c | 202 ++
drivers/net/wireless/mwifiex/util.c | 252 ++
drivers/net/wireless/mwifiex/util.h | 32 +
drivers/net/wireless/mwifiex/wmm.c | 1237 ++++++++
drivers/net/wireless/mwifiex/wmm.h | 112 +
drivers/net/wireless/mwl8k.c | 749 +++++-
drivers/net/wireless/rt2x00/rt2400pci.c | 6 +-
drivers/net/wireless/rt2x00/rt2500pci.c | 6 +-
drivers/net/wireless/rt2x00/rt2500usb.c | 5 -
drivers/net/wireless/rt2x00/rt2800.h | 106 +
drivers/net/wireless/rt2x00/rt2800lib.c | 198 ++-
drivers/net/wireless/rt2x00/rt2800lib.h | 1 +
drivers/net/wireless/rt2x00/rt2800pci.c | 19 +-
drivers/net/wireless/rt2x00/rt2800usb.c | 3 +-
drivers/net/wireless/rt2x00/rt2x00.h | 7 +-
drivers/net/wireless/rt2x00/rt2x00debug.c | 1 -
drivers/net/wireless/rt2x00/rt2x00dev.c | 28 +-
drivers/net/wireless/rt2x00/rt2x00ht.c | 7 +-
drivers/net/wireless/rt2x00/rt2x00lib.h | 23 +-
drivers/net/wireless/rt2x00/rt2x00link.c | 49 +-
drivers/net/wireless/rt2x00/rt2x00pci.c | 7 +-
drivers/net/wireless/rt2x00/rt2x00pci.h | 5 +-
drivers/net/wireless/rt2x00/rt2x00queue.c | 18 +-
drivers/net/wireless/rt2x00/rt2x00queue.h | 1 +
drivers/net/wireless/rt2x00/rt61pci.c | 6 +-
drivers/net/wireless/rt2x00/rt73usb.c | 2 -
drivers/net/wireless/rtlwifi/base.c | 5 +-
drivers/net/wireless/rtlwifi/core.c | 8 +-
drivers/net/wireless/rtlwifi/efuse.c | 106 +-
drivers/net/wireless/rtlwifi/pci.c | 53 +-
drivers/net/wireless/rtlwifi/pci.h | 4 +-
drivers/net/wireless/rtlwifi/ps.c | 3 +-
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 38 +-
drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 4 +-
drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +-
drivers/net/wireless/rtlwifi/wifi.h | 18 +-
drivers/net/wireless/wl1251/cmd.h | 4 +-
drivers/net/wireless/wl1251/event.c | 6 +-
drivers/net/wireless/wl1251/main.c | 22 +-
drivers/net/wireless/wl1251/ps.c | 23 +-
drivers/net/wireless/wl1251/ps.h | 2 +-
drivers/net/wireless/wl1251/wl1251.h | 9 +-
drivers/net/wireless/zd1211rw/zd_chip.c | 262 +-
drivers/net/wireless/zd1211rw/zd_chip.h | 529 ++--
drivers/net/wireless/zd1211rw/zd_rf.h | 2 +-
drivers/net/wireless/zd1211rw/zd_rf_al2230.c | 198 +-
drivers/net/wireless/zd1211rw/zd_rf_al7230b.c | 240 +-
drivers/net/wireless/zd1211rw/zd_rf_rf2959.c | 78 +-
drivers/net/wireless/zd1211rw/zd_rf_uw2453.c | 86 +-
drivers/net/wireless/zd1211rw/zd_usb.c | 4 +-
drivers/net/wireless/zd1211rw/zd_usb.h | 2 +-
drivers/ssb/driver_pcicore.c | 104 +-
drivers/ssb/scan.c | 2 +-
include/linux/ath9k_platform.h | 5 +
include/linux/ieee80211.h | 9 +
include/linux/nl80211.h | 35 +-
include/linux/ssb/ssb.h | 2 +-
include/net/bluetooth/hci.h | 40 +-
include/net/bluetooth/hci_core.h | 25 +-
include/net/bluetooth/l2cap.h | 2 -
include/net/bluetooth/mgmt.h | 47 +
include/net/cfg80211.h | 43 +
net/bluetooth/bnep/bnep.h | 148 +-
net/bluetooth/bnep/core.c | 71 +-
net/bluetooth/bnep/sock.c | 2 +-
net/bluetooth/cmtp/capi.c | 6 +-
net/bluetooth/cmtp/cmtp.h | 11 +-
net/bluetooth/cmtp/core.c | 25 +-
net/bluetooth/cmtp/sock.c | 2 +-
net/bluetooth/hci_core.c | 79 +-
net/bluetooth/hci_event.c | 95 +-
net/bluetooth/hci_sysfs.c | 40 +-
net/bluetooth/hidp/core.c | 90 +-
net/bluetooth/hidp/hidp.h | 6 +-
net/bluetooth/hidp/sock.c | 7 +-
net/bluetooth/l2cap_core.c | 27 +-
net/bluetooth/mgmt.c | 518 ++++-
net/mac80211/Kconfig | 1 -
net/mac80211/cfg.c | 13 +-
net/mac80211/debugfs.c | 89 +-
net/mac80211/ibss.c | 3 +-
net/mac80211/ieee80211_i.h | 4 +-
net/mac80211/main.c | 5 -
net/mac80211/mlme.c | 9 -
net/mac80211/rx.c | 2 +
net/mac80211/sta_info.c | 15 +-
net/mac80211/sta_info.h | 1 -
net/mac80211/status.c | 11 +-
net/mac80211/tkip.c | 4 +-
net/mac80211/tkip.h | 4 +-
net/mac80211/util.c | 2 +-
net/mac80211/wep.c | 34 +-
net/mac80211/wep.h | 4 +-
net/wireless/mlme.c | 9 +
net/wireless/nl80211.c | 55 +-
net/wireless/nl80211.h | 3 +
net/wireless/reg.c | 71 +-
230 files changed, 29858 insertions(+), 12692 deletions(-)
delete mode 100644 drivers/net/wireless/ath/ar9170/Kconfig
delete mode 100644 drivers/net/wireless/ath/ar9170/Makefile
delete mode 100644 drivers/net/wireless/ath/ar9170/ar9170.h
delete mode 100644 drivers/net/wireless/ath/ar9170/cmd.c
delete mode 100644 drivers/net/wireless/ath/ar9170/cmd.h
delete mode 100644 drivers/net/wireless/ath/ar9170/eeprom.h
delete mode 100644 drivers/net/wireless/ath/ar9170/hw.h
delete mode 100644 drivers/net/wireless/ath/ar9170/led.c
delete mode 100644 drivers/net/wireless/ath/ar9170/mac.c
delete mode 100644 drivers/net/wireless/ath/ar9170/main.c
delete mode 100644 drivers/net/wireless/ath/ar9170/phy.c
delete mode 100644 drivers/net/wireless/ath/ar9170/usb.c
delete mode 100644 drivers/net/wireless/ath/ar9170/usb.h
create mode 100644 drivers/net/wireless/iwlwifi/iwl-io.c
create mode 100644 drivers/net/wireless/mwifiex/11n.c
create mode 100644 drivers/net/wireless/mwifiex/11n.h
create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.c
create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.h
create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.c
create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.h
create mode 100644 drivers/net/wireless/mwifiex/Kconfig
create mode 100644 drivers/net/wireless/mwifiex/Makefile
create mode 100644 drivers/net/wireless/mwifiex/README
create mode 100644 drivers/net/wireless/mwifiex/cfg80211.c
create mode 100644 drivers/net/wireless/mwifiex/cfg80211.h
create mode 100644 drivers/net/wireless/mwifiex/cfp.c
create mode 100644 drivers/net/wireless/mwifiex/cmdevt.c
create mode 100644 drivers/net/wireless/mwifiex/debugfs.c
create mode 100644 drivers/net/wireless/mwifiex/decl.h
create mode 100644 drivers/net/wireless/mwifiex/fw.h
create mode 100644 drivers/net/wireless/mwifiex/init.c
create mode 100644 drivers/net/wireless/mwifiex/ioctl.h
create mode 100644 drivers/net/wireless/mwifiex/join.c
create mode 100644 drivers/net/wireless/mwifiex/main.c
create mode 100644 drivers/net/wireless/mwifiex/main.h
create mode 100644 drivers/net/wireless/mwifiex/scan.c
create mode 100644 drivers/net/wireless/mwifiex/sdio.c
create mode 100644 drivers/net/wireless/mwifiex/sdio.h
create mode 100644 drivers/net/wireless/mwifiex/sta_cmd.c
create mode 100644 drivers/net/wireless/mwifiex/sta_cmdresp.c
create mode 100644 drivers/net/wireless/mwifiex/sta_event.c
create mode 100644 drivers/net/wireless/mwifiex/sta_ioctl.c
create mode 100644 drivers/net/wireless/mwifiex/sta_rx.c
create mode 100644 drivers/net/wireless/mwifiex/sta_tx.c
create mode 100644 drivers/net/wireless/mwifiex/txrx.c
create mode 100644 drivers/net/wireless/mwifiex/util.c
create mode 100644 drivers/net/wireless/mwifiex/util.h
create mode 100644 drivers/net/wireless/mwifiex/wmm.c
create mode 100644 drivers/net/wireless/mwifiex/wmm.h
Omnibus patch available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-next-2.6-2011-04-12.patch.bz2
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply
* [PATCH] 9p: Kill set but unused variable in 9p_client_{read,write}() and p9_client_readdir()
From: David Miller @ 2011-04-12 22:59 UTC (permalink / raw)
To: netdev
Fixes the following warnings:
net/9p/client.c:1305:18: warning: variable ‘total’ set but not used [-Wunused-but-set-variable]
net/9p/client.c:1370:18: warning: variable ‘total’ set but not used [-Wunused-but-set-variable]
net/9p/client.c:1769:18: warning: variable ‘total’ set but not used [-Wunused-but-set-variable]
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/9p/client.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/net/9p/client.c b/net/9p/client.c
index 48b8e08..0ce9592 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -1302,7 +1302,7 @@ int
p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
u32 count)
{
- int err, rsize, total;
+ int err, rsize;
struct p9_client *clnt;
struct p9_req_t *req;
char *dataptr;
@@ -1311,7 +1311,6 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
(long long unsigned) offset, count);
err = 0;
clnt = fid->clnt;
- total = 0;
rsize = fid->iounit;
if (!rsize || rsize > clnt->msize-P9_IOHDRSZ)
@@ -1367,7 +1366,7 @@ int
p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
u64 offset, u32 count)
{
- int err, rsize, total;
+ int err, rsize;
struct p9_client *clnt;
struct p9_req_t *req;
@@ -1375,7 +1374,6 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
fid->fid, (long long unsigned) offset, count);
err = 0;
clnt = fid->clnt;
- total = 0;
rsize = fid->iounit;
if (!rsize || rsize > clnt->msize-P9_IOHDRSZ)
@@ -1766,7 +1764,7 @@ EXPORT_SYMBOL_GPL(p9_client_xattrcreate);
int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset)
{
- int err, rsize, total;
+ int err, rsize;
struct p9_client *clnt;
struct p9_req_t *req;
char *dataptr;
@@ -1776,7 +1774,6 @@ int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset)
err = 0;
clnt = fid->clnt;
- total = 0;
rsize = fid->iounit;
if (!rsize || rsize > clnt->msize-P9_READDIRHDRSZ)
--
1.7.4.3
^ permalink raw reply related
* Re: Bonding/LACP on RTL8169sc/8110sc (R1869)
From: Jay Vosburgh @ 2011-04-12 22:47 UTC (permalink / raw)
To: Jonathan Thibault; +Cc: netdev, Francois Romieu
In-Reply-To: <4DA45518.60407@navigue.com>
Jonathan Thibault <jonathan@navigue.com> wrote:
>I have a a pair of Jetway motherboards with an add-on 3Gbit LAN modules
>and have been doing some testing for a linux router project. I found
>that I while I can get LACP working properly using eth0 and eth1, using
>the exact same setup with any of the other three lan fails. Is this a
>known issue?
Fails how, exactly? If eth2/3/4 is part of the bond, then no
aggregation forms at all, or those devices don't join, or what?
>This is on Linux 2.6.32.10. Here is a blurb of dmesg showing the NICs
>detected.
That's a fairly old kernel; one relatively recent fix that comes
to mind is:
commit ab12811c89e88f2e66746790b1fe4469ccb7bdd9
Author: Andy Gospodarek <andy@greyhouse.net>
Date: Fri Sep 10 11:43:20 2010 +0000
bonding: correctly process non-linear skbs
It was recently brought to my attention that 802.3ad mode bonds would no
longer form when using some network hardware after a driver update.
After snooping around I realized that the particular hardware was using
page-based skbs and found that skb->data did not contain a valid LACPDU
as it was not stored there. That explained the inability to form an
802.3ad-based bond. For balance-alb mode bonds this was also an issue
as ARPs would not be properly processed.
>eth0: RTL8168b/8111b at 0xf8adc000, 00:30:18:ac:a6:80, XID 0c200000 IRQ 24
>eth1: RTL8168b/8111b at 0xf8ae0000, 00:30:18:ac:a6:81, XID 0c200000 IRQ 25
>eth2: RTL8169sc/8110sc at 0xf8ae4c00, 00:30:18:ae:34:3a, XID 18000000 IRQ 18
>eth3: RTL8169sc/8110sc at 0xf8ae8800, 00:30:18:ae:34:3b, XID 18000000 IRQ 19
>eth4: RTL8169sc/8110sc at 0xf8aec400, 00:30:18:ae:34:3c, XID 18000000 IRQ 16
The fix might apply if your eth2/3/4 hardware uses page based
skbs as mentioned in this commit.
Also, what is your network topology? Are all the devices
connected to the same switch?
>I can probably manage this project using only eth0 and eth1 in LACP
>configuration but I figured I'd give a heads up.
>
>The interfaces seem able to detect when the link is up or down, bonding
>removes and adds them to the LACP trunk but I can't get traffic through
>them.
If the above commit doesn't resolve the problem, can you post
some sample output of /proc/net/bonding/bondX (with the appropriate
value for "X") when you've got the "bad" devices in the bond, along with
a description of exactly what doesn't work?
-J
---
-Jay Vosburgh, IBM Linux Technology Center, fubar@us.ibm.com
^ permalink raw reply
* Re: [PATCH 2/3] MIPS: lantiq: add ethernet driver
From: David Miller @ 2011-04-12 22:46 UTC (permalink / raw)
To: blogic; +Cc: ralf, ralph.hempel, linux-mips, netdev
In-Reply-To: <1302624675-18652-3-git-send-email-blogic@openwrt.org>
From: John Crispin <blogic@openwrt.org>
Date: Tue, 12 Apr 2011 18:11:14 +0200
> This patch adds the driver for the ETOP Packet Processing Engine (PPE32) found
> inside the XWAY family of Lantiq MIPS SoCs. This driver makes 100MBit ethernet
> work. Support for all 8 dma channels, gbit and the embedded switch found on
> the ar9/vr9 still needs to be implemented.
>
> Signed-off-by: John Crispin <blogic@openwrt.org>
> Signed-off-by: Ralph Hempel <ralph.hempel@lantiq.com>
This driver needs some work.
> +
> + skb_put(skb, len);
> + skb->dev = dev;
> + skb->protocol = eth_type_trans(skb, dev);
> + netif_rx(skb);
> + priv->stats.rx_packets++;
> + priv->stats.rx_bytes += len;
Please convert this driver to use NAPI for packet reception.
> + local_irq_save(flags);
> + priv->rx_tasklet_running = 0;
> + if (priv->rx_channel_mask) {
> + priv->rx_tasklet_running = 1;
> + tasklet_schedule(&priv->rx_tasklet);
> + }
> + local_irq_restore(flags);
This doesn't protect anything, use proper locking.
^ permalink raw reply
* Re: [PATCH] net: Do not wrap sysctl igmp_max_memberships in IP_MULTICAST
From: Joakim Tjernlund @ 2011-04-12 22:41 UTC (permalink / raw)
To: David Miller; +Cc: netdev
In-Reply-To: <20110412.140016.189701267.davem@davemloft.net>
David Miller <davem@davemloft.net> wrote on 2011/04/12 23:00:16:
>
> From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
> Date: Tue, 12 Apr 2011 11:49:34 +0200
>
> > controlling igmp_max_membership is useful even when IP_MULTICAST
> > is off.
> > Quagga(an OSPF deamon) uses multicast addresses for all interfaces
> > using a single socket and hits igmp_max_membership limit when
> > there are 20 interfaces or more.
> > Always export sysctl igmp_max_memberships in proc, just like
> > igmp_max_msf
> >
> > Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
>
> I really like your commit message, a full justification and a
> reference to existing similar behavior.
>
> If only every patch submitter did this :-/
Thanks, I really wish all my commit msgs are like the above.
Jocke
^ permalink raw reply
* Re: pr_debug usage in raw_sendmsg
From: David Miller @ 2011-04-12 22:33 UTC (permalink / raw)
To: davej; +Cc: netdev
In-Reply-To: <20110412223137.GA25528@redhat.com>
From: Dave Jones <davej@redhat.com>
Date: Tue, 12 Apr 2011 18:31:37 -0400
> While working on my system call fuzzer, I keep getting a lot
> of spew in dmesg from raw_sendmsg. Particularly..
>
> [ 6442.690780] no dev
> [ 6454.257701] msg_flags 0x00000080
> [ 8055.873142] msg->msg_flags = 0xd63f35c1
>
> Is there a good reason for keeping -DDEBUG in net/ieee802154/Makefile ?
>
> Those messages don't look particularly helpful given there's no other context.
> (the 'no dev' one in particular looks kinda hopeless)
All of those cflags modifications in net/ieee802154/Makefile are bogus,
I'll commit the following:
--------------------
ieee802154: Remove hacked CFLAGS in net/ieee802154/Makefile
It adds -Wall (which the kernel carefully controls already) and of all
things -DDEBUG (which should be set by other means if desired, please
we have dynamic-debug these days).
Kill this noise.
Reported-by: Dave Jones <davej@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/ieee802154/Makefile | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/net/ieee802154/Makefile b/net/ieee802154/Makefile
index ce2d335..5761185 100644
--- a/net/ieee802154/Makefile
+++ b/net/ieee802154/Makefile
@@ -1,5 +1,3 @@
obj-$(CONFIG_IEEE802154) += ieee802154.o af_802154.o
ieee802154-y := netlink.o nl-mac.o nl-phy.o nl_policy.o wpan-class.o
af_802154-y := af_ieee802154.o raw.o dgram.o
-
-ccflags-y += -Wall -DDEBUG
--
1.7.4.3
^ permalink raw reply related
* pr_debug usage in raw_sendmsg
From: Dave Jones @ 2011-04-12 22:31 UTC (permalink / raw)
To: netdev
While working on my system call fuzzer, I keep getting a lot
of spew in dmesg from raw_sendmsg. Particularly..
[ 6442.690780] no dev
[ 6454.257701] msg_flags 0x00000080
[ 8055.873142] msg->msg_flags = 0xd63f35c1
Is there a good reason for keeping -DDEBUG in net/ieee802154/Makefile ?
Those messages don't look particularly helpful given there's no other context.
(the 'no dev' one in particular looks kinda hopeless)
Dave
^ permalink raw reply
* Re: fix locking unbalance in irda_sendmsg
From: David Miller @ 2011-04-12 22:30 UTC (permalink / raw)
To: davej; +Cc: netdev, linux-kernel
In-Reply-To: <20110412221254.GA23906@redhat.com>
From: Dave Jones <davej@redhat.com>
Date: Tue, 12 Apr 2011 18:12:55 -0400
> 5b40964eadea40509d353318d2c82e8b7bf5e8a5 introduced a path where
> we have a locking unbalance. If we pass invalid flags, we unlock
> a socket we never locked, resulting in this...
...
> Signed-off-by: Dave Jones <davej@redhat.com>
Applied and queued up for -stable, thanks Dave.
^ permalink raw reply
* Re: [PATCH 1/1] ipv6: RTA_PREFSRC support for ipv6 route source address selection
From: David Miller @ 2011-04-12 22:16 UTC (permalink / raw)
To: dwalter; +Cc: netdev, linux-kernel
In-Reply-To: <20110412.150511.35038648.davem@davemloft.net>
From: David Miller <davem@davemloft.net>
Date: Tue, 12 Apr 2011 15:05:11 -0700 (PDT)
> From: Daniel Walter <dwalter@barracuda.com>
> Date: Mon, 11 Apr 2011 09:03:29 +0200
>
>> [ipv6] Add support for RTA_PREFSRC
>>
>> This patch allows a user to select the preferred source address
>> for a specific IPv6-Route. It can be set via a netlink message
>> setting RTA_PREFSRC to a valid IPv6 address which must be
>> up on the device the route will be bound to.
>>
>>
>> Signed-off-by: Daniel Walter <dwalter@barracuda.com>
>
> Ok, I can live with this, applied, thanks!
Sorry, I had to revert.
Please fix this warning, test your patch, and resubmit it.
net/ipv6/ip6_output.c: In function ‘ip6_dst_lookup_tail’:
net/ipv6/ip6_output.c:936: warning: passing argument 3 of ‘ip6_route_get_saddr’ from incompatible pointer type
include/net/ip6_route.h:87: note: expected ‘struct in6_addr *’ but argument is of type ‘struct dst_entry **’
Thanks.
^ permalink raw reply
* fix locking unbalance in irda_sendmsg
From: Dave Jones @ 2011-04-12 22:12 UTC (permalink / raw)
To: netdev; +Cc: Linux Kernel
5b40964eadea40509d353318d2c82e8b7bf5e8a5 introduced a path where
we have a locking unbalance. If we pass invalid flags, we unlock
a socket we never locked, resulting in this...
=====================================
[ BUG: bad unlock balance detected! ]
-------------------------------------
trinity/20101 is trying to release lock (sk_lock-AF_IRDA) at:
[<ffffffffa057f001>] irda_sendmsg+0x207/0x21d [irda]
but there are no more locks to release!
other info that might help us debug this:
no locks held by trinity/20101.
stack backtrace:
Pid: 20101, comm: trinity Not tainted 2.6.39-rc3+ #3
Call Trace:
[<ffffffffa057f001>] ? irda_sendmsg+0x207/0x21d [irda]
[<ffffffff81085041>] print_unlock_inbalance_bug+0xc7/0xd2
[<ffffffffa057f001>] ? irda_sendmsg+0x207/0x21d [irda]
[<ffffffff81086aca>] lock_release+0xcf/0x18e
[<ffffffff813ed190>] release_sock+0x2d/0x155
[<ffffffffa057f001>] irda_sendmsg+0x207/0x21d [irda]
[<ffffffff813e9f8c>] __sock_sendmsg+0x69/0x75
[<ffffffff813ea105>] sock_sendmsg+0xa1/0xb6
[<ffffffff81100ca3>] ? might_fault+0x5c/0xac
[<ffffffff81086b7c>] ? lock_release+0x181/0x18e
[<ffffffff81100cec>] ? might_fault+0xa5/0xac
[<ffffffff81100ca3>] ? might_fault+0x5c/0xac
[<ffffffff81133b94>] ? fcheck_files+0xb9/0xf0
[<ffffffff813f387a>] ? copy_from_user+0x2f/0x31
[<ffffffff813f3b70>] ? verify_iovec+0x52/0xa6
[<ffffffff813eb4e3>] sys_sendmsg+0x23a/0x2b8
[<ffffffff81086b7c>] ? lock_release+0x181/0x18e
[<ffffffff810773c6>] ? up_read+0x28/0x2c
[<ffffffff814bec3d>] ? do_page_fault+0x360/0x3b4
[<ffffffff81087043>] ? trace_hardirqs_on_caller+0x10b/0x12f
[<ffffffff810458aa>] ? finish_task_switch+0xb2/0xe3
[<ffffffff8104583e>] ? finish_task_switch+0x46/0xe3
[<ffffffff8108364a>] ? trace_hardirqs_off_caller+0x33/0x90
[<ffffffff814bbaf9>] ? retint_swapgs+0x13/0x1b
[<ffffffff81087043>] ? trace_hardirqs_on_caller+0x10b/0x12f
[<ffffffff810a9dd3>] ? audit_syscall_entry+0x11c/0x148
[<ffffffff8125609e>] ? trace_hardirqs_on_thunk+0x3a/0x3f
[<ffffffff814c22c2>] system_call_fastpath+0x16/0x1b
Signed-off-by: Dave Jones <davej@redhat.com>
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index c9890e2..cc61697 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -1297,8 +1297,7 @@ static int irda_sendmsg(struct kiocb *iocb, struct socket *sock,
/* Note : socket.c set MSG_EOR on SEQPACKET sockets */
if (msg->msg_flags & ~(MSG_DONTWAIT | MSG_EOR | MSG_CMSG_COMPAT |
MSG_NOSIGNAL)) {
- err = -EINVAL;
- goto out;
+ return -EINVAL;
}
lock_sock(sk);
^ permalink raw reply related
* Re: [PATCH 1/1] ipv6: RTA_PREFSRC support for ipv6 route source address selection
From: David Miller @ 2011-04-12 22:05 UTC (permalink / raw)
To: dwalter; +Cc: netdev, linux-kernel
In-Reply-To: <1302505409.8923.2.camel@localhost>
From: Daniel Walter <dwalter@barracuda.com>
Date: Mon, 11 Apr 2011 09:03:29 +0200
> [ipv6] Add support for RTA_PREFSRC
>
> This patch allows a user to select the preferred source address
> for a specific IPv6-Route. It can be set via a netlink message
> setting RTA_PREFSRC to a valid IPv6 address which must be
> up on the device the route will be bound to.
>
>
> Signed-off-by: Daniel Walter <dwalter@barracuda.com>
Ok, I can live with this, applied, thanks!
^ permalink raw reply
* Re: [PATCH 2/2] net/natsami: store MAC into perm_addr
From: David Miller @ 2011-04-12 21:56 UTC (permalink / raw)
To: otavio; +Cc: netdev
In-Reply-To: <1302622241-11871-2-git-send-email-otavio@ossystems.com.br>
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 12 Apr 2011 12:30:41 -0300
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Applied.
^ permalink raw reply
* Re: [PATCH 1/2] net/sis900: store MAC into perm_addr for SiS 900, 630E, 635 and 96x variants
From: David Miller @ 2011-04-12 21:56 UTC (permalink / raw)
To: otavio; +Cc: netdev
In-Reply-To: <1302622241-11871-1-git-send-email-otavio@ossystems.com.br>
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 12 Apr 2011 12:30:40 -0300
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Applied.
^ permalink raw reply
* Re: [PATCH] net: bna: convert to hw_features
From: Debashis Dutt @ 2011-04-12 21:56 UTC (permalink / raw)
To: David Miller; +Cc: mirq-linux, netdev, rmody, ddutt
In-Reply-To: <20110412.145259.102551828.davem@davemloft.net>
2011/4/12 David Miller <davem@davemloft.net>:
> From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> Date: Tue, 12 Apr 2011 21:38:23 +0200 (CEST)
>
>> Note: looks like bnad->conf_mutex is duplicating rtnl_lock.
>>
>> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
>
> Applied.
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
Thanks Michal & David.
Patch looks good. We will still do some unit-testing and let you know,
in case of any hiccups.
Thanks
--Debashis
^ permalink raw reply
* Re: [PATCH] net: vlan_features comment clarification
From: David Miller @ 2011-04-12 21:54 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev
In-Reply-To: <20110412140739.1DF1713909@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Tue, 12 Apr 2011 16:07:39 +0200 (CEST)
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied, thanks.
^ permalink raw reply
* SMSC 8720a/MDIO/PHY help.
From: ANDY KENNEDY @ 2011-04-12 21:46 UTC (permalink / raw)
To: netdev
I have written my MDIO driver, registered it via mdiobus_register(), and
have verified that the SCMS LAN8710 driver picks it up (via sysfs).
What am I missing? The state machine never starts. I get no runs,
hits, or errors (and nobody left -- it is baseball season after all).
If you have an idea of something for me to try, I'd love to entertain
it.
Thanks,
Andy
^ permalink raw reply
* Re: [PATCH] net: ioc3: convert to hw_features
From: David Miller @ 2011-04-12 21:53 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, ralf, linux-mips
In-Reply-To: <20110412194817.3420713A65@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Tue, 12 Apr 2011 21:48:17 +0200 (CEST)
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied.
^ permalink raw reply
* Re: [PATCH] net: bna: convert to hw_features
From: David Miller @ 2011-04-12 21:52 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, rmody, ddutt
In-Reply-To: <20110412193823.177C613A64@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Tue, 12 Apr 2011 21:38:23 +0200 (CEST)
> Note: looks like bnad->conf_mutex is duplicating rtnl_lock.
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied.
^ permalink raw reply
* Re: [PATCH v5] net: bnx2x: convert to hw_features
From: David Miller @ 2011-04-12 21:52 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, vladz, eilong
In-Reply-To: <20110412193823.0823213A65@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Tue, 12 Apr 2011 21:38:23 +0200 (CEST)
> Since ndo_fix_features callback is postponing features change when
> bp->recovery_state != BNX2X_RECOVERY_DONE, netdev_update_features()
> has to be called again when this condition changes. Previously,
> ethtool_ops->set_flags callback returned -EBUSY in that case
> (it's not possible in the new model).
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
>
> v5: - don't delay set_features, as it's rtnl_locked - same as recovery process
> v4: - complete bp->rx_csum -> NETIF_F_RXCSUM conversion
> - add check for failed ndo_set_features in ndo_open callback
> v3: - include NETIF_F_LRO in hw_features
> - don't call netdev_update_features() if bnx2x_nic_load() failed
> v2: - comment in ndo_fix_features callback
I've applied this.
From what I can tell the is basic agreement from the Broadcom folks,
and if any fixups are needed that can be done with follow-up
patches.
Thanks.
^ permalink raw reply
* Re: [PATCH RESENT] net: ps3_gelic: convert to hw_features
From: David Miller @ 2011-04-12 21:51 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, geoff, linuxppc-dev, cbe-oss-dev
In-Reply-To: <20110410144955.8620813909@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Sun, 10 Apr 2011 16:49:55 +0200 (CEST)
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied.
^ permalink raw reply
* Re: [PATCH] net: sky2: convert to hw_features
From: David Miller @ 2011-04-12 21:51 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev, shemminger
In-Reply-To: <20110410131321.8CD9713A64@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Sun, 10 Apr 2011 15:13:21 +0200 (CEST)
> Caveats:
> - driver modifies vlan_features on HW VLAN TX changes
> - broken RX checksum will be reenabled on features change
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
It seems the checksum concern exists both before and after these
changes, so I'm going to apply this and you guys can send me a
fixup fir the RX checksum feature validation issue as a follow-on
patch.
Thanks!
^ permalink raw reply
* Re: 2.6.39-rc2 boot crash
From: David Miller @ 2011-04-12 21:39 UTC (permalink / raw)
To: kaber; +Cc: zbr, emunson, dave, linux-kernel, gregkh, ksrinivasan, netdev
In-Reply-To: <4DA47247.20700@trash.net>
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 12 Apr 2011 17:39:51 +0200
> I think this patch should fix the problem. Eric, could you please
> give it a try?
Applied, thanks everyone.
^ permalink raw reply
* Re: [PATCH] net: add RTNL_ASSERT in __netdev_update_features()
From: David Miller @ 2011-04-12 21:36 UTC (permalink / raw)
To: mirq-linux; +Cc: netdev
In-Reply-To: <20110412195638.3983613A65@rere.qmqm.pl>
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Tue, 12 Apr 2011 21:56:38 +0200 (CEST)
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Applied, thanks!
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox