* pull request: wireless-next 2013-01-28
From: John W. Linville @ 2013-01-28 20:20 UTC (permalink / raw)
To: davem; +Cc: linux-wireless, netdev
[-- Attachment #1: Type: text/plain, Size: 33172 bytes --]
Dave,
Please accept this pull request intended for the 3.9 stream!
Included is an NFC pull. Samuel says:
"It brings the following goodies:
- LLCP socket timestamping (To be used e.g with the recently released nfctool
application for a more efficient skb timestamping when sniffing).
- A pretty big pn533 rework from Waldemar, preparing the driver to support
more flavours of pn533 based devices.
- HCI changes from Eric in preparation for the microread driver support.
- Some LLCP memory leak fixes, cleanups and slight improvements.
- pn544 and nfcwilink move to the devm_kzalloc API.
- An initial Secure Element (SE) API.
- An nfc.h license change from the original author, allowing non GPL
application code to safely include it."
Also included are a pair of mac80211 pulls. Johannes says:
"We found two bugs in the previous code, so I'm sending you a pull
request again this soon.
This contains two regulatory bug fixes, some of Thomas's hwsim beacon
timer work and a documentation fix from Bob."
"Another pull request for mac80211-next. This time, I have a number of
things, the patches are mostly self-explanatory. There are a few fixes
from Felix and myself, and random cleanups & improvements. The biggest
thing is the partial patchset from Marco preparing for mesh powersave."
Additionally, there are a pair of iwlwifi pulls. Johannes says:
"For iwlwifi-next, I have a few cleanups/improvements as well as a few
not very important fixes and more preparations for new devices."
"Please pull a few updates for iwlwifi. These are just some cleanups and
a debug improvement."
On top of that, there is a slew of driver updates. This includes
brcmfmac, mwifiex, ath9k, carl9170, and mwl8k as well as a handful
of others. The bcma and ssb busses get some attention as well.
Still, I don't see any big headliners here.
Also included is a pull of the wireless tree, in order to resolve
some merge conflicts.
Please let me know if there are problems!
John
P.S. This is bigger than I would like it to be. I'm sorry that I got behind!
---
The following changes since commit cef401de7be8c4e155c6746bfccf721a4fa5fab9:
net: fix possible wrong checksum generation (2013-01-28 00:27:15 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git for-davem
for you to fetch changes up to 4205e6ef4ee747aa81930537b6035086ba5f1e28:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem (2013-01-28 14:43:00 -0500)
----------------------------------------------------------------
AceLan Kao (3):
Bluetooth: Add support for IMC Networks [13d3:3393]
Bluetooth: Add support for Foxconn / Hon Hai [0489:e04e]
Bluetooth: Add support for Foxconn / Hon Hai [0489:e056]
Alexey Khoroshilov (3):
p54pci: don't return zero on failure paths in p54p_probe()
mwl8k: don't return zero on failure paths in mwl8k_probe[_hw]()
iwlegacy: don't return zero on failure paths in il4965_pci_probe()
Amitkumar Karwar (4):
mwifiex: use correct htcapinfo for HT20 ibss network
mwifiex: update config_bands during infra association
mwifiex: correct config_bands handling for ibss network
mwifiex: correction in status codes used for association failure
Anderson Lizardo (1):
Bluetooth: Fix incorrect strncpy() in hidp_setup_hid()
Arend van Spriel (10):
brcmsmac: use perimeter lock in add_interface() callback
brcmsmac: allow user-space setting of interface address
brcmfmac: assure USB dongle firmware is reset upon module unload
brcmfmac: define pr_fmt in one place
brcmfmac: remove rx helper function from bus interface
brcmfmac: remove brcmf_proto_hdrpull() from bus interface
brcmfmac: remove unused event related definitions
brcmfmac: cleanup netdev transmit callback
brcmfmac: remove unnecessary curly braces in dhd_attach()
nl80211: allow user-space to set address for P2P_DEVICE
Avinash Patil (7):
mwifiex: parse WMM IEs from hostapd for mwifiex AP
mwifiex: access interrupt status only while holding lock
mwifiex: add init_fw_port handler for PCIe interface
mwifiex: use pci_alloc/free_consistent APIs for PCIe
mwifiex: flush TX ring for PCIe after disconnect or bss stop
mwifiex: use map/unmap APIs in TX and RX to reduce memcpy
mwifiex: fix typo in PCIe adapter NULL check
Ben Greear (1):
mac80211: Allow disabling SGI-20
Bob Copeland (3):
mac80211: fix mesh_hwmp kerneldoc
mac80211: set NEED_TXPROCESSING for PERR frames
mac80211: add encrypt headroom to PERR frames
Chen Gang (1):
drivers/net/wireless: need consider the not '\0' terminated string.
Christian Lamparter (8):
carl9170: advertise support for TDLS
carl9170: import 1.9.7 firmware headers
carl9170: allow P2P_GO interface creation after P2P_CLIENT
carl9170: Only specify interface combinations if more than one interface is possible
carl9170: don't enable hw crypto offload, if the fw doesn't support it
carl9170: disable hw crypto for p2p networks
carl9170: remove custom NUM_TID and friends
carl9170: refactor carl9170_update_beacon
Chun-Yeow Yeoh (2):
mac80211: use short slot time in mesh for 5GHz
mac80211: allow disable power save in mesh
Cong Ding (1):
net: wireless/rtlwifi: fix uninitialized variable issue
Dan Carpenter (2):
b43: N-PHY: fix gain in b43_nphy_get_gain_ctl_workaround_ent()
prism54: bug in getting auth type
Daniel Schaal (1):
Bluetooth: Add support for GC-WB300D PCIe [04ca:3006] to ath3k.
Emmanuel Grumbach (12):
mac82011: use frame control to differentiate probe resp/beacon
iwlwifi: make the BC table layout configurable
iwlwifi: clean up code in AGG
iwlwifi: don't verify fw after download
iwlwifi: let the op_mode run a FW while in RFKILL
iwlwifi: virtualize iwl_{grab,release}_nic_access
iwlwifi: virtualize SRAM access
iwlwifi: don't treat a bool as an error code
iwlwifi: always check that grab_nic_access succeeds
iwlwifi: allow to zero SRAM
iwlwifi: audit single frames from AGG queue in RS
iwlwifi: improve the reports in TX path
Eric Lapuyade (6):
NFC: Fixed nfc core and hci unregistration and cleanup
NFC: Added error handling in event_received hci ops
NFC: Changed event_received hci ops result semantic
NFC: Fixed skb leak in tm_send() nfc and hci ops implementations
NFC: Add HCI quirks to support driver (non)standard implementations
NFC: update HCI documentation
Eytan Lifshitz (1):
iwlwifi: fix spelling and value in LED registers.
Felix Fietkau (23):
ath9k: use the devres API for allocations/mappings
ath9k_hw: use the devres API for allocations
wireless: fix regulatory HT40 allowed check
ath9k: do not link receive buffers during flush
ath9k: fix double-free bug on beacon generate failure
ath9k: remove the WARN_ON that triggers if generating a beacon fails
ath9k: add a better fix for the rx tasklet vs rx flush race
ath9k: fix rx flush handling
ath9k_hw: add tx gain tables for newer devices
ath9k: remove sc->rx.rxbuflock to fix a deadlock
ath9k: disable the tasklet before taking the PCU lock
mac80211: fix monitor mode injection
ath9k_hw: fix calibration issues on chainmask that don't include chain 0
ath9k_hw: fix chain swap setting when setting rx chainmask to 5
ath9k: allow setting arbitrary antenna masks on AR9003+
ath9k_hw: fix RF bank initialization
ath9k: stop rx after tx
ath9k: clean up processing of pending tx frames on reset
ath9k: use ath_tx_process_buffer instead of open-coding similar code
ath9k_hw: make the initval parameter to ath9k_hw_write_array const
ath9k_hw: remove ath9k_hw_ani_setup and its variables
ath9k_hw: reduce struct ar5416AniState size
ath9k_hw: remove a useless WARN_ON
Fengguang Wu (1):
ath9k_hw: ar9002_hw_spectral_scan_config() can be static
Gabor Juhos (2):
ath9k: fix column header comments for some initval arrays
rt2x00: rt2800: convert read_eeprom functions to return an int value
Geert Uytterhoeven (1):
brcmsmac: initialize morepending in brcms_b_recv()
Gustavo Padovan (1):
Bluetooth: Check if the hci connection exists in SCO shutdown
Hante Meuleman (7):
brcmfmac: do not reconfigure refill rx on 0-length packet.
brcmfmac: removed deprecated set_bitrate_mask support
brcmfmac: Use dedicated trace level for CDC.
brcmfmac: Remove unused caching dongle error.
brcmfmac: Return correct error on netdev xmit.
brcmfmac: Removing obsolete variables and inline functions.
brcmfmac: Update init code routines from interface up.
Hauke Mehrtens (7):
bcma: make bcma_find_core_unit() accessible
bcma: mips: explicit assign IRQ numbers
bcma: mips: make some info messages debug messages
bcma: mips: show also disabled IRQs
bcma: mips: remove assigned_irqs from structure
bcma: mips: rename oldirqflag to irqinitmask
bcma: fix compile error
Helmut Schaa (1):
rt2x00: Improve TX status handling for BlockAckReq frames
Jaganath Kanakkassery (1):
Bluetooth: Fix authentication if acl data comes before remote feature evt
Johannes Berg (65):
Merge remote-tracking branch 'mac80211/master' into HEAD
mac80211_hwsim: allow testing paged RX
mac80211: remove final sta_info_flush()
mac80211: warn if unexpectedly removing stations
mac80211: optimise roaming time again
mac80211: remove a bit of dead mesh code
regulatory: don't write past array when intersecting rules
regulatory: don't allocate too much memory
regulatory: clean up regdom_intersect
regulatory: clean up reg_copy_regd()
regulatory: don't test list before iterating
regulatory: simplify regulatory_hint_11d
regulatory: code cleanup
regulatory: remove useless locking on exit
regulatory: use proper enum for return values
cfg80211: remove wiphy_idx_valid
regulatory: remove BUG_ON
regulatory: simplify restore_regulatory_settings
regulatory: remove redundant isalpha() check
regulatory: remove useless warning
regulatory: simplify freq_reg_info_regd
regulatory: clarify locking rules and assertions
regulatory: remove locking from wiphy_apply_custom_regulatory
regulatory: fix reg_is_valid_request handling
regulatory: remove handling of channel bandwidth
regulatory: pass new regdomain to reset function
regulatory: use RCU to protect global and wiphy regdomains
regulatory: use RCU to protect last_request
regulatory: use IS_ERR macro family for freq_reg_info
mac80211: optimise AP stop RCU handling
cfg80211: adjacent 80+80 MHz channel segments are invalid
mac80211: fix ieee80211_ie_build_vht_cap indentation
mac80211: clean up ieee80211_quiesce
mac80211: clean up association better in suspend
mac80211: fix channel context iteration
mac80211: track enable_beacon explicitly
mac80211: reconfig bss_info_changed only if beaconing
mac80211: further simplify ieee80211_bss_info_change_notify
mac80211: assign bss_conf.bssid only once
mac80211: restrict assoc request VHT capabilities
cfg80211: move some AP code to right file
nl80211/mac80211: support full station state in AP mode
mac80211: split aggregation stop by reason
mac80211: split out aggregation TX removal
mac80211: move ieee80211_remove_tid_tx function
mac80211: split TX aggregation stop action
wireless: use __packed in ieee80211.h
mac80211: support HT notify channel width action
wireless: use __aligned
mac80211: unset peer's HT 40 MHz support if not usable
cfg80211: disallow more station changes
iwlwifi: use __packed
iwlwifi: request IRQ only once
iwlwifi: move some PCIe calls to better places
regulatory: fix uevent
regulatory: fix restore_regulatory_settings
mac80211: fix HT40 connections
iwlwifi: don't memset scalar values
iwlwifi: don't enable all interrupts on resuming
iwlwifi: simplify scheduler memory clearing
iwlwifi: enable communication with WoWLAN firmware
mac80211: fix FT roaming
mac80211: fix resume from WoWLAN
mac80211: call restart complete at wowlan resume time
mac80211: split out chandef tracing macros
John W. Linville (9):
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-next
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
Merge tag 'nfc-next-3.9-1' of git://git.kernel.org/.../sameo/nfc-next
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-next
Merge branch 'for-john' of git://git.kernel.org/.../jberg/mac80211-next
Merge branch 'master' of git://git.kernel.org/.../linville/wireless
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-next into for-davem
Jouni Malinen (1):
cfg80211: Allow use_mfp to be specified with the connect command
Julia Lawall (2):
NFC: nfcwilink: Use devm_kzalloc
drivers/nfc/nfcwilink.c: use devm_kzalloc
Larry Finger (1):
rtlwifi: Fix build warning introduced by commit a290593
Lauro Ramos Venancio (1):
NFC: Change nfc.h license
Luis R. Rodriguez (4):
cfg80211: do not process beacon hints if one is already queued
cfg80211: move reg_is_world_roaming()
cfg80211: move world roaming check for beacon hints
wireless: make the reg_notifier() void
Marco Porsch (5):
nl80211: add range checks to mesh parameters
mac80211: update mesh peer link counter during userspace peering
mac80211: move add_tim to subfunction
{cfg,nl,mac}80211: set beacon interval and DTIM period on mesh join
{cfg,nl}80211: mesh power mode primitives and userspace access
Nathan Hintz (8):
bcma: return the mips irq number in bcma_core_irq
bcma: update pci configuration for bcm4706/bcm4716
bcma: fix bcm4716/bcm4748 i2s irqflag
bcma: delete duplicate readl
bcma: jump to 'out' label for invalid 'func' value
bcma: don't map/unmap a subset of the PCI config space
bcma: add support for 1 and 2 byte extended config space access
bcma: use consistent case for 'hex' constants
Nishant Sarmukadam (2):
mwl8k: Disable tx_wait completion
mwl8k: Wake up queues in mwl8k_start
Piotr Haber (3):
brcmsmac: increase timer reference count for new timers only
brcmsmac: remove dead code
brcmsmac: increase timer reference count for new timers only
Rafał Miłecki (2):
ssb: add place for serial flash driver
ssb: add database of serial flash memories
Samuel Ortiz (9):
NFC: llcp: Remove the tx backlog queue
NFC: llcp: Fix Rx memory leak
NFC: pn544: Separate the core code and the i2c one into different modules
NFC: pn544: Use module_i2c_driver
NFC: pn544: Use devm_kzalloc API
NFC: Initial Secure Element API
NFC: Update pn544 documentation
NFC: Avoid memcpy on LLCP connection less Rx path
NFC: Use skb_copy_datagram_iovec
Sasha Levin (1):
wireless: mwifiex: remove unreachable paths
Sergio Cambra (1):
Bluetooth device 04ca:3008 should use ath3k
Simon Wunderlich (3):
ath9k: add spectral scan feature
ath9k: fix spectral scan endless mode on AR9002
cfg80211: check radar interface combinations
Stanislaw Gruszka (5):
rt2800: refactor RFCSR initialization
iwlegacy: add flush callback
iwlegacy: allow to enable PS
mac80211: synchronize scan off/on-channel and PS states
iwlegacy: fix IBSS cleanup
Sujith Manoharan (11):
ath9k_hw: Remove AR9485 1.0 macro
ath9k_hw: Enable calibration types in init_cal_settings
ath9k_hw: Remove TEMP_COMP_CAL
ath9k_hw: Fix calibration for AR9340
ath9k_hw: Do not enable IQ-CAL for half/quarter rates
ath9k_hw: Fix MCI init for AGC calibration
ath9k_hw: Use helper routines to simplify ar9003_hw_init_cal()
ath9k_hw: Update initvals for QCA955x
ath9k_hw: Add TempCompensation feature for AR9550
ath9k_hw: Fix radio programming for AR9550
ath9k_htc: Fix memory leak
Szymon Janc (1):
Bluetooth: Fix sending HCI commands after reset
Thierry Escande (2):
NFC: Add support for SO_TIMESTAMP LLCP socket option
NFC: pn533: Fix bad allocation size
Thomas Pedersen (4):
mac80211_hwsim: fix tsf adjustment
mac80211_hwsim: hrtimer beacon
mac80211_hwsim: fix beacon timing
mac80211_hwsim: fix beacon timestamp and mactime
Vladimir Kondratiev (1):
wireless: more 'capability info' bits
Waldemar Rymarkiewicz (28):
NFC: pn533: Remove in/out_maxlen as it is not used
NFC: pn533: Remove unused definitions
NFC: pn533: Add frame header length define
NFC: pn533: Remove pointless flags param
NFC: pn533: Add a new pn533_send_cmd_async iface
NFC: pn533: Add a new pn533_send_data_async iface
NFC: pn533: Add a new pn533_send_sync iface
NFC: pn533: Add pn533_alloc_skb for req allocation
NFC: pn533: Remove pn533_send_cmd_frame_sync
NFC: pn533: Del frame logic from TgGet/SetData cmd
NFC: pn533: Del frame logic from InJumForDep cmd
NFC: pn533: Del frame logic from Data Exchange cmd
NFC: pn533: Dump tx and rx data in debug mode
NFC: pn533: Remove frame logic from poll cmds
NFC: pn533: Fix quoted strings split across lines
NFC: pn533: Fix spacing issues
NFC: pn533: Fix open parenthesis alignment
NFC: pn533: Fix minor style issues
NFC: pn533: Remove unused pn533_send_cmd_frame_asy
NFC: pn533: Fix urb->status handling
NFC: pn533: Cleanup debug messages
NFC: pn533: Don't use out_frame in pn533_send_ack
NFC: pn533: Use skb in __pn533_send_cmd_frame_asyn
NFC: pn533: Remove deprecated dev->out_frame buff
NFC: pn533: Cleanup pn533_cmd_complete_t
NFC: pn533: Remove unused dev->wq_in_frame
NFC: pn533: Introduce ops for frame logic
NFC: pn533: Fix missing parenthesis
Yacine Belkadi (1):
{cfg,mac}80211.h: fix some kernel-doc warnings
Yogesh Ashok Powar (8):
mwl8k: Remove redundant txq_idx
mwl8k: set ack policy to normal
mwl8k: Enable support to support additional ampdu streams
mwl8k: changing mwl8k_destroy_ba prototype
mwl8k: Handle Watchdog events for the new ampdu streams
mwl8k: Handle watchdog event with highest prioriry
mwl8k: bump firmware API to 3
mwl8k: Delete ampdu streams with state AMPDU_STREAM_NEW in sta remove
Documentation/nfc/nfc-hci.txt | 129 +-
Documentation/nfc/nfc-pn544.txt | 84 +-
arch/mips/bcm47xx/serial.c | 2 +-
drivers/bcma/bcma_private.h | 2 +
drivers/bcma/driver_chipcommon.c | 2 +-
drivers/bcma/driver_mips.c | 157 +-
drivers/bcma/driver_pci_host.c | 62 +-
drivers/bcma/main.c | 4 +-
drivers/bluetooth/ath3k.c | 10 +
drivers/bluetooth/btusb.c | 5 +
drivers/net/wireless/ath/ath5k/base.c | 5 +-
drivers/net/wireless/ath/ath6kl/cfg80211.c | 16 +-
drivers/net/wireless/ath/ath9k/ahb.c | 22 +-
drivers/net/wireless/ath/ath9k/ani.c | 33 +-
drivers/net/wireless/ath/ath9k/ani.h | 8 -
drivers/net/wireless/ath/ath9k/ar5008_initvals.h | 8 +-
drivers/net/wireless/ath/ath9k/ar5008_phy.c | 50 +-
drivers/net/wireless/ath/ath9k/ar9001_initvals.h | 4 +-
drivers/net/wireless/ath/ath9k/ar9002_hw.c | 23 +-
drivers/net/wireless/ath/ath9k/ar9002_phy.c | 66 +-
.../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 180 +++
drivers/net/wireless/ath/ath9k/ar9003_calib.c | 145 +-
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 128 +-
drivers/net/wireless/ath/ath9k/ar9003_hw.c | 69 +-
drivers/net/wireless/ath/ath9k/ar9003_phy.c | 122 +-
drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 +-
drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 100 ++
drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 146 ++
.../net/wireless/ath/ath9k/ar955x_1p0_initvals.h | 132 +-
.../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 76 +
drivers/net/wireless/ath/ath9k/ath9k.h | 165 +-
drivers/net/wireless/ath/ath9k/beacon.c | 4 +-
drivers/net/wireless/ath/ath9k/debug.c | 116 +-
drivers/net/wireless/ath/ath9k/debug.h | 7 +-
drivers/net/wireless/ath/ath9k/htc_drv_init.c | 8 +-
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 4 +-
drivers/net/wireless/ath/ath9k/htc_hst.c | 2 +
drivers/net/wireless/ath/ath9k/hw-ops.h | 16 -
drivers/net/wireless/ath/ath9k/hw.c | 48 +-
drivers/net/wireless/ath/ath9k/hw.h | 59 +-
drivers/net/wireless/ath/ath9k/init.c | 116 +-
drivers/net/wireless/ath/ath9k/mac.h | 3 +-
drivers/net/wireless/ath/ath9k/main.c | 163 +-
drivers/net/wireless/ath/ath9k/mci.c | 7 +-
drivers/net/wireless/ath/ath9k/pci.c | 39 +-
drivers/net/wireless/ath/ath9k/recv.c | 171 ++-
drivers/net/wireless/ath/ath9k/reg.h | 7 +-
drivers/net/wireless/ath/ath9k/xmit.c | 145 +-
drivers/net/wireless/ath/carl9170/carl9170.h | 19 +-
drivers/net/wireless/ath/carl9170/fw.c | 37 +-
drivers/net/wireless/ath/carl9170/fwcmd.h | 8 +
drivers/net/wireless/ath/carl9170/hw.h | 2 +-
drivers/net/wireless/ath/carl9170/main.c | 113 +-
drivers/net/wireless/ath/carl9170/tx.c | 133 +-
drivers/net/wireless/ath/carl9170/version.h | 6 +-
drivers/net/wireless/ath/regd.c | 37 +-
drivers/net/wireless/ath/regd.h | 10 +-
drivers/net/wireless/b43/tables_nphy.c | 30 +-
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 -
.../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 2 -
drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 39 +-
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 19 +-
drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 48 +-
.../net/wireless/brcm80211/brcmfmac/dhd_common.c | 2 -
drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 35 +-
.../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 90 +-
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 24 +-
.../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 2 -
drivers/net/wireless/brcm80211/brcmfmac/usb.c | 27 +-
.../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 94 +-
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 7 +-
drivers/net/wireless/brcm80211/brcmsmac/channel.c | 13 +-
.../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 14 +-
drivers/net/wireless/brcm80211/brcmsmac/main.c | 9 +-
drivers/net/wireless/brcm80211/brcmsmac/scb.h | 1 -
drivers/net/wireless/iwlegacy/3945-mac.c | 6 +-
drivers/net/wireless/iwlegacy/4965-mac.c | 10 +-
drivers/net/wireless/iwlegacy/common.c | 71 +-
drivers/net/wireless/iwlegacy/common.h | 1 +
drivers/net/wireless/iwlwifi/dvm/commands.h | 8 +-
drivers/net/wireless/iwlwifi/dvm/debugfs.c | 4 +-
drivers/net/wireless/iwlwifi/dvm/led.c | 2 +-
drivers/net/wireless/iwlwifi/dvm/mac80211.c | 20 +-
drivers/net/wireless/iwlwifi/dvm/main.c | 21 +-
drivers/net/wireless/iwlwifi/dvm/tt.c | 4 +-
drivers/net/wireless/iwlwifi/dvm/tx.c | 51 +-
drivers/net/wireless/iwlwifi/dvm/ucode.c | 96 +-
drivers/net/wireless/iwlwifi/iwl-csr.h | 4 +-
drivers/net/wireless/iwlwifi/iwl-fh.h | 4 +
drivers/net/wireless/iwlwifi/iwl-io.c | 168 +--
drivers/net/wireless/iwlwifi/iwl-io.h | 21 +-
drivers/net/wireless/iwlwifi/iwl-test.c | 53 +-
drivers/net/wireless/iwlwifi/iwl-trans.h | 99 +-
drivers/net/wireless/iwlwifi/pcie/internal.h | 8 +-
drivers/net/wireless/iwlwifi/pcie/rx.c | 14 +-
drivers/net/wireless/iwlwifi/pcie/trans.c | 309 +++-
drivers/net/wireless/iwlwifi/pcie/tx.c | 79 +-
drivers/net/wireless/libertas/cfg.c | 33 +-
drivers/net/wireless/libertas/cfg.h | 3 -
drivers/net/wireless/mac80211_hwsim.c | 177 ++-
drivers/net/wireless/mwifiex/11n.c | 4 +-
drivers/net/wireless/mwifiex/11n_aggr.c | 6 +-
drivers/net/wireless/mwifiex/cfg80211.c | 25 +-
drivers/net/wireless/mwifiex/decl.h | 18 +
drivers/net/wireless/mwifiex/fw.h | 14 +-
drivers/net/wireless/mwifiex/init.c | 6 +
drivers/net/wireless/mwifiex/ioctl.h | 3 +-
drivers/net/wireless/mwifiex/join.c | 30 +-
drivers/net/wireless/mwifiex/main.h | 6 +
drivers/net/wireless/mwifiex/pcie.c | 656 +++++---
drivers/net/wireless/mwifiex/pcie.h | 33 +-
drivers/net/wireless/mwifiex/sta_cmd.c | 10 +-
drivers/net/wireless/mwifiex/sta_ioctl.c | 14 +
drivers/net/wireless/mwifiex/txrx.c | 6 +-
drivers/net/wireless/mwifiex/uap_cmd.c | 44 +
drivers/net/wireless/mwifiex/usb.c | 30 +-
drivers/net/wireless/mwifiex/util.h | 8 +-
drivers/net/wireless/mwifiex/wmm.c | 8 +-
drivers/net/wireless/mwl8k.c | 151 +-
drivers/net/wireless/p54/p54pci.c | 7 +-
drivers/net/wireless/prism54/isl_ioctl.c | 1 +
drivers/net/wireless/ray_cs.c | 19 +-
drivers/net/wireless/rt2x00/rt2800lib.c | 814 +++++-----
drivers/net/wireless/rt2x00/rt2800lib.h | 8 +-
drivers/net/wireless/rt2x00/rt2800pci.c | 35 +-
drivers/net/wireless/rt2x00/rt2800usb.c | 12 +-
drivers/net/wireless/rt2x00/rt2x00.h | 20 +
drivers/net/wireless/rt2x00/rt2x00dev.c | 101 +-
drivers/net/wireless/rt2x00/rt2x00queue.c | 47 +
drivers/net/wireless/rtlwifi/Kconfig | 4 +-
drivers/net/wireless/rtlwifi/core.c | 4 +-
drivers/net/wireless/rtlwifi/regd.c | 37 +-
drivers/net/wireless/rtlwifi/regd.h | 6 +-
drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 2 +-
drivers/net/wireless/ti/wlcore/main.c | 10 +-
drivers/nfc/Kconfig | 15 +-
drivers/nfc/Makefile | 2 +-
drivers/nfc/nfcwilink.c | 10 +-
drivers/nfc/pn533.c | 1593 ++++++++++----------
drivers/nfc/pn544/Kconfig | 23 +
drivers/nfc/pn544/Makefile | 5 +-
drivers/nfc/pn544/i2c.c | 44 +-
drivers/nfc/pn544/pn544.c | 65 +-
drivers/ssb/Kconfig | 5 +
drivers/ssb/Makefile | 1 +
drivers/ssb/driver_chipcommon_sflash.c | 140 ++
drivers/ssb/driver_mipscore.c | 3 +-
drivers/ssb/ssb_private.h | 11 +
include/linux/bcma/bcma_driver_mips.h | 4 +-
include/linux/bcma/bcma_driver_pci.h | 2 +
include/linux/ieee80211.h | 100 +-
include/net/cfg80211.h | 212 ++-
include/net/mac80211.h | 112 +-
include/net/nfc/hci.h | 22 +-
include/net/nfc/nci_core.h | 1 +
include/net/nfc/nfc.h | 8 +
include/net/regulatory.h | 4 +
include/uapi/linux/nfc.h | 37 +-
include/uapi/linux/nl80211.h | 72 +-
net/bluetooth/hci_core.c | 8 -
net/bluetooth/hci_event.c | 2 +-
net/bluetooth/hidp/core.c | 2 +-
net/bluetooth/l2cap_core.c | 11 +
net/bluetooth/sco.c | 2 +-
net/mac80211/agg-tx.c | 253 ++--
net/mac80211/cfg.c | 179 ++-
net/mac80211/chan.c | 3 +-
net/mac80211/driver-ops.h | 23 +-
net/mac80211/ht.c | 33 +-
net/mac80211/ibss.c | 57 +-
net/mac80211/ieee80211_i.h | 29 +-
net/mac80211/iface.c | 38 +-
net/mac80211/main.c | 70 +-
net/mac80211/mesh.c | 35 +-
net/mac80211/mesh.h | 16 +-
net/mac80211/mesh_hwmp.c | 10 +-
net/mac80211/mesh_plink.c | 14 -
net/mac80211/mlme.c | 72 +-
net/mac80211/offchannel.c | 34 +-
net/mac80211/pm.c | 64 +-
net/mac80211/rx.c | 31 +-
net/mac80211/scan.c | 24 +-
net/mac80211/sta_info.c | 48 +-
net/mac80211/sta_info.h | 42 +-
net/mac80211/trace.h | 24 +-
net/mac80211/tx.c | 56 +-
net/mac80211/util.c | 25 +-
net/nfc/core.c | 50 +-
net/nfc/hci/command.c | 7 +-
net/nfc/hci/core.c | 57 +-
net/nfc/hci/hcp.c | 7 +
net/nfc/llcp/commands.c | 2 +
net/nfc/llcp/llcp.c | 44 +-
net/nfc/llcp/llcp.h | 1 -
net/nfc/llcp/sock.c | 22 +-
net/nfc/nci/core.c | 2 +
net/nfc/netlink.c | 1 +
net/wireless/ap.c | 62 +
net/wireless/chan.c | 4 +
net/wireless/core.c | 26 +-
net/wireless/core.h | 25 +-
net/wireless/mesh.c | 8 +
net/wireless/mlme.c | 62 -
net/wireless/nl80211.c | 268 ++--
net/wireless/reg.c | 1124 ++++++--------
net/wireless/reg.h | 7 +-
net/wireless/sme.c | 9 +-
net/wireless/util.c | 41 +-
210 files changed, 7702 insertions(+), 4987 deletions(-)
create mode 100644 drivers/nfc/pn544/Kconfig
create mode 100644 drivers/ssb/driver_chipcommon_sflash.c
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH net] ipv6 addrconf: Fix interface identifiers of 802.15.4 devices.
From: YOSHIFUJI Hideaki @ 2013-01-28 20:44 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-zigbee-devel, alex.bluesman.smirnov, YOSHIFUJI Hideaki
The "Universal/Local" (U/L) bit must be complmented according to RFC4944
and RFC2464.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---
net/ipv6/addrconf.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 420e563..1b5d8cb 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1660,6 +1660,7 @@ static int addrconf_ifid_eui64(u8 *eui, struct net_device *dev)
if (dev->addr_len != IEEE802154_ADDR_LEN)
return -1;
memcpy(eui, dev->dev_addr, 8);
+ eui[0] ^= 2;
return 0;
}
--
1.7.9.5
^ permalink raw reply related
* Re: [PATCH 2/2] drivers: net:ethernet: cpsw: add support for VLAN
From: Felipe Balbi @ 2013-01-28 20:44 UTC (permalink / raw)
To: Mugunthan V N; +Cc: netdev, davem, linux-arm-kernel, linux-omap
In-Reply-To: <1359403945-28585-3-git-send-email-mugunthanvnm@ti.com>
[-- Attachment #1: Type: text/plain, Size: 2409 bytes --]
On Tue, Jan 29, 2013 at 01:42:25AM +0530, Mugunthan V N wrote:
> adding support for VLAN interface for cpsw.
>
> CPSW VLAN Capability
> * Can filter VLAN packets in Hardware
>
> Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
> ---
> Documentation/devicetree/bindings/net/cpsw.txt | 2 +
> drivers/net/ethernet/ti/cpsw.c | 108 +++++++++++++++++++++++-
> include/linux/platform_data/cpsw.h | 1 +
> 3 files changed, 110 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt
> index 6ddd028..99696bf 100644
> --- a/Documentation/devicetree/bindings/net/cpsw.txt
> +++ b/Documentation/devicetree/bindings/net/cpsw.txt
> @@ -24,6 +24,8 @@ Required properties:
> Optional properties:
> - ti,hwmods : Must be "cpgmac0"
> - no_bd_ram : Must be 0 or 1
> +- default_vlan : Specifies Default VLAN for non tagged packets
> + ALE processing
>
> Note: "ti,hwmods" field is used to fetch the base address and irq
> resources from TI, omap hwmod data base during device registration.
> diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
> index b35e6a7..dee6951 100644
> --- a/drivers/net/ethernet/ti/cpsw.c
> +++ b/drivers/net/ethernet/ti/cpsw.c
> @@ -32,6 +32,7 @@
> #include <linux/of.h>
> #include <linux/of_net.h>
> #include <linux/of_device.h>
> +#include <linux/if_vlan.h>
>
> #include <linux/platform_data/cpsw.h>
>
> @@ -72,6 +73,11 @@ do { \
> dev_notice(priv->dev, format, ## __VA_ARGS__); \
> } while (0)
>
> +#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
use IS_ENABLED() instead.
> +#define VLAN_SUPPORT
> +#define CPSW_VLAN_AWARE_MODE
> +#endif
> +
> #define ALE_ALL_PORTS 0x7
>
> #define CPSW_MAJOR_VERSION(reg) (reg >> 8 & 0x7)
> @@ -118,6 +124,14 @@ do { \
> #define TX_PRIORITY_MAPPING 0x33221100
> #define CPDMA_TX_PRIORITY_MAP 0x76543210
>
> +#ifdef CPSW_VLAN_AWARE_MODE
> +#define CPSW_VLAN_AWARE BIT(1)
> +#define CPSW_ALE_VLAN_AWARE 1
> +#else
> +#define CPSW_VLAN_AWARE 0x0
> +#define CPSW_ALE_VLAN_AWARE 0
> +#endif
you should really figure out a way of doing runtime detection for this.
Depending on driver recompilation just to enable/disable VLAN support
will be quite boring.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH] checkpatch.pl: Fix warnings on code comments
From: Jeff Kirsher @ 2013-01-28 20:56 UTC (permalink / raw)
To: Joe Perches
Cc: Allan, Bruce W, David Miller, apw@canonical.com,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
In-Reply-To: <1359394228.31480.7.camel@joe-AO722>
[-- Attachment #1: Type: text/plain, Size: 937 bytes --]
On Mon, 2013-01-28 at 09:30 -0800, Joe Perches wrote:
> On Mon, 2013-01-28 at 17:17 +0000, Allan, Bruce W wrote:
> > David Miller Sent: Sunday, January 27, 2013 7:07 PM
> > > From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > > > So will you be fine with cleanup patches which go through and
> > > > convert all the existing code comments to the desired format?
> > > Sure.
> > Not all Intel drivers...e1000e already conforms to the comment style :-)
>
> In case anyone cares, here's a perl regex
> to do network comment style conversion.
>
> $text =~ s@/\*[ \t]*\n[ \t]*\*@/*@g;
> $text =~ s@/\*([ \t]*)([^\n]+)\n[ \t]*\*/@/\*$1$2 \*/@g;
>
> (assumes the entire file is in $text)
>
> It creates a ~220KB diff for drivers/net/ethernet/intel/
> that I won't post.
>
Thanks Joe, I will get patches to take care of the Intel drivers (minus
e1000e since Bruce has already completed that work).
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCH] SCTP: Free the per-net sysctl table on net exit. v2
From: Martin Mokrejs @ 2013-01-28 21:17 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: David Miller, vyasevich, netdev, linux-sctp
In-Reply-To: <877gmxtim7.fsf@xmission.com>
Hi Eric,
Eric W. Biederman wrote:
> Martin Mokrejs <mmokrejs@fold.natur.cuni.cz> writes:
>
>> David Miller wrote:
>>> From: ebiederm@xmission.com (Eric W. Biederman)
>>> Date: Sun, 27 Jan 2013 19:25:11 -0800
>>>
>>>> The typo is fixed in the patch this time in addition to my test
>>>> tree.
>>>
>>> Applied, thanks for fixing this up Eric.
>>
>> I did check now how come that I patched my 3.7.4 on Jan 24. Looks like
>> -head or -next has different namings. For me, the original patch applied
>> fine. So far I haven't hit the memleak although it happened only once to me
>> before the patch.
>
> The problem isn't that the patch doesn't apply the problem is that the
> patch did not build. The naming has not changed in the git history.
>
>> But probably I can confirm say Tested-by:.
>>
>> #
>> -rw-r--r-- 1 root root 8435 Jan 24 17:12 /usr/src/linux-3.7.4/net/sctp/sysctl.c
>> -rw-rw-r-- 1 root root 8347 Jan 21 20:45 /usr/src/linux-3.7.4/net/sctp/sysctl.c.orig
>> # ls -la /usr/src/linux-3.7.4/net/sctp/sysctl.o
>> -rw-r--r-- 1 root root 246144 Jan 21 22:37 /usr/src/linux-3.7.4/net/sctp/sysctl.o
>> # ls -la /usr/src/linux-3.7.4/arch/x86/boot/bzImage
>> -rw-r--r-- 1 root root 3794592 Jan 21 22:45 /usr/src/linux-3.7.4/arch/x86/boot/bzImage
>> #
>
> It doesn't look look like you rebuilt anything after you applied the
> changes to net/sctp/sysctl.c. sysctl.o and bzImage are both 3 days older.
Ah, I must have been really blind. Thanks for pointing that out. I should
really start to do:
make bzImage && make modules && make modules_install && cp arch/x86_64/boot/bzImage /boot/vmlinuz-$ver
echo "silly me, make(1) did not delete the old bzImage"
So I haven't tested the patch yet. doh. Provided I am running 3 days without reproducing
the original memleak on an unpatched kernel I doubt I can easily prove it after a reboot.
:( Will probably stay untested. But compiles fine here. ;-)
Thanks,
Martin
^ permalink raw reply
* Re: [PATCH] SCTP: Free the per-net sysctl table on net exit. v2
From: Martin Mokrejs @ 2013-01-28 21:25 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: David Miller, vyasevich, netdev, linux-sctp
In-Reply-To: <5106EAD5.6000703@fold.natur.cuni.cz>
Martin Mokrejs wrote:
> Hi Eric,
>
> Eric W. Biederman wrote:
>> Martin Mokrejs <mmokrejs@fold.natur.cuni.cz> writes:
>>
>>> David Miller wrote:
>>>> From: ebiederm@xmission.com (Eric W. Biederman)
>>>> Date: Sun, 27 Jan 2013 19:25:11 -0800
>>>>
>>>>> The typo is fixed in the patch this time in addition to my test
>>>>> tree.
>>>>
>>>> Applied, thanks for fixing this up Eric.
> So I haven't tested the patch yet. doh. Provided I am running 3 days without reproducing
> the original memleak on an unpatched kernel I doubt I can easily prove it after a reboot.
Umm, I spoke too early. It did happen again during these 3 days on unpatched 3.7.4:
unreferenced object 0xffff880402769030 (size 2048):
comm "chrome_sandbox", pid 4720, jiffies 4294966701 (age 285697.590s)
hex dump (first 32 bytes):
b2 68 89 81 ff ff ff ff 20 84 4f d8 03 88 ff ff .h...... .O.....
04 00 00 00 a4 01 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff815b4aad>] kmemleak_alloc+0x21/0x3e
[<ffffffff81110352>] slab_post_alloc_hook+0x28/0x2a
[<ffffffff81113fad>] __kmalloc_track_caller+0xf1/0x104
[<ffffffff810f10c2>] kmemdup+0x1b/0x30
[<ffffffff81571e9f>] sctp_sysctl_net_register+0x1f/0x72
[<ffffffff8155d305>] sctp_net_init+0x100/0x39f
[<ffffffff814ad53c>] ops_init+0xc6/0xf5
[<ffffffff814ad5b7>] setup_net+0x4c/0xd0
[<ffffffff814ada5e>] copy_net_ns+0x6d/0xd6
[<ffffffff810938b1>] create_new_namespaces+0xd7/0x147
[<ffffffff810939f4>] copy_namespaces+0x63/0x99
[<ffffffff81076733>] copy_process+0xa65/0x1233
[<ffffffff81077030>] do_fork+0x10b/0x271
[<ffffffff8100a0e9>] sys_clone+0x23/0x25
[<ffffffff815dda73>] stub_clone+0x13/0x20
[<ffffffffffffffff>] 0xffffffffffffffff
But I won't make it to a reboot in next 2-3 days to test the patch v2, sorry.
Martin
^ permalink raw reply
* drivers/net/wireless/iwlwifi/dvm/tx.c: Kernel trace when roaming between different Access Points with the same ESSID
From: Richard Hartmann @ 2013-01-28 21:55 UTC (permalink / raw)
To: Johannes Berg, Wey-Yi Guy, Intel Linux Wireless, John W. Linville,
Emmanuel Grumbach, linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Hi all,
I can somewhat reproduce this trace. It will happen when roaming from
one AP to another AP, both having the same ESSID.
Once this happens, wireless stops working. This can be fixed by running
rmmod iwldvm iwlwifi mac80211 cfg80211; sleep 10; modprobe iwlwifi
Trace:
[ 8920.123776] ------------[ cut here ]------------
[ 8920.123797] WARNING: at
/build/buildd-linux_3.7.1-1~experimental.1-i386-Au6THQ/linux-3.7.1/drivers/net/wireless/iwlwifi/dvm/tx.c:1189
iwlagn_rx_reply_tx+0x288/0x6e2 [iwldvm]()
[ 8920.123800] Hardware name: 4286CTO
[ 8920.123802] Modules linked in: parport_pc ppdev lp parport bnep
rfcomm cpufreq_userspace cpufreq_stats cpufreq_powersave
cpufreq_conservative uinput nfsd auth_rpcgss nfs_acl nfs lockd
dns_resolver fscache sunrpc ext4 jbd2 mbcache loop fuse
snd_hda_codec_hdmi snd_hda_codec_conexant arc4 coretemp i915
snd_hda_intel iwldvm mac80211 joydev drm_kms_helper drm snd_hda_codec
snd_hwdep snd_pcm i2c_algo_bit kvm_intel btusb kvm thinkpad_acpi
snd_page_alloc nvram bluetooth i2c_i801 iwlwifi crc32c_intel crc16
snd_seq snd_seq_device snd_timer iTCO_wdt acpi_cpufreq mperf
aesni_intel iTCO_vendor_support i2c_core psmouse pcspkr snd aes_i586
xts lrw ac soundcore battery lpc_ich evdev mei tpm_tis gf128mul
ablk_helper video serio_raw mfd_core button cfg80211 rfkill tpm cryptd
tpm_bios processor wmi xfs sg sd_mod crc_t10dif mmc_block microcode
ahci libahci xhci_hcd libata sdhci_pci sdhci mmc_core scsi_mod
ehci_hcd e1000e usbcore usb_common thermal thermal_sys
[ 8920.123891] Pid: 0, comm: swapper/0 Not tainted 3.7-trunk-686-pae
#1 Debian 3.7.1-1~experimental.1
[ 8920.123893] Call Trace:
[ 8920.123902] [<c10310c5>] ? warn_slowpath_common+0x68/0x79
[ 8920.123912] [<f86961e2>] ? iwlagn_rx_reply_tx+0x288/0x6e2 [iwldvm]
[ 8920.123916] [<c10310e3>] ? warn_slowpath_null+0xd/0x10
[ 8920.123924] [<f86961e2>] ? iwlagn_rx_reply_tx+0x288/0x6e2 [iwldvm]
[ 8920.123929] [<c10574b0>] ? load_balance+0x33c/0x520
[ 8920.123940] [<f869b344>] ? iwl_rx_dispatch+0x57/0x63 [iwldvm]
[ 8920.123948] [<f85b0d14>] ? iwl_irq_tasklet+0x39c/0x698 [iwlwifi]
[ 8920.123953] [<c1037457>] ? tasklet_action+0x62/0xa5
[ 8920.123957] [<c103711b>] ? __do_softirq+0x90/0x192
[ 8920.123961] [<c103708b>] ? perf_trace_irq_handler_entry+0xd7/0xd7
[ 8920.123962] <IRQ> [<c10372cb>] ? irq_exit+0x32/0x7d
[ 8920.123971] [<c100d070>] ? do_IRQ+0x65/0x76
[ 8920.123976] [<c12ed2f3>] ? common_interrupt+0x33/0x38
[ 8920.123980] [<c10300d8>] ? copy_process.part.33+0x8a8/0xf0c
[ 8920.123985] [<c11b1c03>] ? intel_idle+0xc4/0xec
[ 8920.123990] [<c122ea2e>] ? cpuidle_enter+0xb/0xe
[ 8920.123994] [<c122edb9>] ? cpuidle_enter_state+0x9/0x33
[ 8920.123998] [<c122ee8e>] ? cpuidle_idle_call+0xab/0x146
[ 8920.124002] [<c10114d7>] ? cpu_idle+0x88/0xac
[ 8920.124006] [<c1464966>] ? start_kernel+0x334/0x339
[ 8920.124009] ---[ end trace fc6895e52f152baf ]---
lspci:
00:00.0 Host bridge: Intel Corporation 2nd Generation Core Processor
Family DRAM Controller (rev 09)
00:02.0 VGA compatible controller: Intel Corporation 2nd Generation
Core Processor Family Integrated Graphics Controller (rev 09)
00:16.0 Communication controller: Intel Corporation 6 Series/C200
Series Chipset Family MEI Controller #1 (rev 04)
00:16.3 Serial controller: Intel Corporation 6 Series/C200 Series
Chipset Family KT Controller (rev 04)
00:19.0 Ethernet controller: Intel Corporation 82579LM Gigabit Network
Connection (rev 04)
00:1a.0 USB controller: Intel Corporation 6 Series/C200 Series Chipset
Family USB Enhanced Host Controller #2 (rev 04)
00:1b.0 Audio device: Intel Corporation 6 Series/C200 Series Chipset
Family High Definition Audio Controller (rev 04)
00:1c.0 PCI bridge: Intel Corporation 6 Series/C200 Series Chipset
Family PCI Express Root Port 1 (rev b4)
00:1c.1 PCI bridge: Intel Corporation 6 Series/C200 Series Chipset
Family PCI Express Root Port 2 (rev b4)
00:1c.3 PCI bridge: Intel Corporation 6 Series/C200 Series Chipset
Family PCI Express Root Port 4 (rev b4)
00:1c.4 PCI bridge: Intel Corporation 6 Series/C200 Series Chipset
Family PCI Express Root Port 5 (rev b4)
00:1c.6 PCI bridge: Intel Corporation 6 Series/C200 Series Chipset
Family PCI Express Root Port 7 (rev b4)
00:1d.0 USB controller: Intel Corporation 6 Series/C200 Series Chipset
Family USB Enhanced Host Controller #1 (rev 04)
00:1f.0 ISA bridge: Intel Corporation QM67 Express Chipset Family LPC
Controller (rev 04)
00:1f.2 SATA controller: Intel Corporation 6 Series/C200 Series
Chipset Family 6 port SATA AHCI Controller (rev 04)
00:1f.3 SMBus: Intel Corporation 6 Series/C200 Series Chipset Family
SMBus Controller (rev 04)
03:00.0 Network controller: Intel Corporation Centrino Ultimate-N 6300 (rev 35)
0d:00.0 System peripheral: Ricoh Co Ltd PCIe SDXC/MMC Host Controller (rev 07)
0e:00.0 USB controller: NEC Corporation uPD720200 USB 3.0 Host
Controller (rev 04)
If you need any more info, please let me know; I am not subscribed on
all lists so please keep me CC'ed.
Thanks,
Richard
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Flag this message TCP fragmentation on IPv6
From: Duc Thinh Le @ 2013-01-28 22:20 UTC (permalink / raw)
To: netdev
Hello TCP experts,
I am sorry to bother you. But I am just wondering if
you can shed some light on how TCP-v6 (Linux - Fedora)
handle the case where it send a segment of 1500 bytes
and then some router along the way sends back the
ICMPv6 "too big - 1300" message. There are two choices:
1) TCPv6 resends the original segment (1500) into
two new TCP segments (one with 1300) and the other
is 200.
OR
2) TCPv6 sends out two IPv6 fragment packets to
achieve the original 1500
OR maybe, there are other ways as well. Thanks for your
times and helps. If there is a another forum that I can ask these
kinds of questions, please let me know. Thanks a lot.
Regards
Duc Le
^ permalink raw reply
* TCP fragmentation on IPv6
From: Duc Thinh Le @ 2013-01-28 22:21 UTC (permalink / raw)
To: netdev
In-Reply-To: <1359411606.93934.YahooMailClassic@web125402.mail.ne1.yahoo.com>
Hello TCP experts,
I am sorry to bother you. But I am just wondering if
you can shed some light on how TCP-v6 (Linux - Fedora)
handle the case where it send a segment of 1500 bytes
and then some router along the way sends back the
ICMPv6 "too big - 1300" message. There are two choices:
1) TCPv6 resends the original segment (1500) into
two new TCP segments (one with 1300) and the other
is 200.
OR
2) TCPv6 sends out two IPv6 fragment packets to
achieve the original 1500
OR maybe, there are other ways as well. Thanks for your
times and helps. If there is a another forum that I can ask these
kinds of questions, please let me know. Thanks a lot.
Regards
Duc Le
^ permalink raw reply
* Re: [PATCH net-next] can: rework skb reserved data handling
From: David Miller @ 2013-01-28 23:17 UTC (permalink / raw)
To: socketcan; +Cc: mkl, netdev
In-Reply-To: <5106C47D.9000704@hartkopp.net>
From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: Mon, 28 Jan 2013 19:33:33 +0100
> Added accessor and skb_reserve helpers for struct can_skb_priv.
> Removed pointless skb_headroom() check.
>
> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
> CC: Marc Kleine-Budde <mkl@pengutronix.de>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH 15/19] sunrpc: don't warn for unused variable 'buf'
From: J. Bruce Fields @ 2013-01-28 23:18 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Russell King - ARM Linux, Myklebust, Trond,
netdev@vger.kernel.org, linux-nfs@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
In-Reply-To: <201301261334.56398.arnd@arndb.de>
On Sat, Jan 26, 2013 at 01:34:56PM +0000, Arnd Bergmann wrote:
> On Saturday 26 January 2013, Russell King - ARM Linux wrote:
> > On Fri, Jan 25, 2013 at 11:45:25PM +0000, Arnd Bergmann wrote:
> > > On Friday 25 January 2013, Myklebust, Trond wrote:
> > > > > -----Original Message-----
> > > > > From: Arnd Bergmann [mailto:arnd@arndb.de]
> > > > > Marking it as __maybe_unused avoids a harmless gcc warning.
> > > >
> > > > Alternatively, just declare it using the RPC_IFDEBUG() macro.
> > >
> > > Right, makes sense: that's more consistent with other functions
> > > doing the same thing. Thanks for taking a look.
> >
> > NAK.
> >
> > There is already a fix queued up as a result of a previous report I
> > sent, but for some reason (which I didn't question) it was decided
> > not to queue it for -rc.
> >
> > See Bruce's reply on lkml: 20130108212816.GA24572@fieldses.org
Apologies, I've seen so many "stop sending me post-rc1 patches that
don't fix serious crashes!" flames.
I guess obviousl compile fixes should be an exception--if nothing else
it'd save a lot of duplicated work as this is something like the 3rd
patch I've seen for this.
--b.
>
> Ok, makes sense. Then again, if that fix is queued for 3.9, maybe
> it still makes sense to take the simpler fix into 3.8, and remove
> it in 3.9 along with the other instances of RPC_IFDEBUG.
^ permalink raw reply
* Re: [net-next 00/14][pull request] Intel Wired LAN Driver Updates
From: David Miller @ 2013-01-28 23:18 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, gospo, sassmann
In-Reply-To: <1359363869-32391-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Mon, 28 Jan 2013 01:04:15 -0800
> This series contains updates to e1000e, ixgbevf, igb and igbvf.
> Majority of the patches are code cleanups of e1000e where code
> is removed (Yeah!). The other two e1000e patches are fixes. The
> first is to fix the maximum frame size for 82579 devices. The second
> fix is to resolve an issue with devices other than 82579 that suffer
> from dropped transactions on platforms with deep C-states when
> jumbo frames are enabled.
>
> The ixgbevf patch is to ensure that the driver fetches the correct,
> refreshed value for link status and speed when the values have changed.
>
> The igb and igbvf patches are a solution to an issue Stefan Assmann
> reported, where when the PF is up and igbvf is loaded, the MAC address
> is not generated using eth_hw_addr_random().
>
> The following are changes since commit a1b1add07fa794974573d93483d68e373edfe7bd:
> gro: Fix kcalloc argument order
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next master
Pulled, thanks Jeff.
^ permalink raw reply
* Re: pull request: wireless-next 2013-01-28
From: David Miller @ 2013-01-28 23:22 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, netdev
In-Reply-To: <20130128202054.GD2107@tuxdriver.com>
From: "John W. Linville" <linville@tuxdriver.com>
Date: Mon, 28 Jan 2013 15:20:55 -0500
> Please accept this pull request intended for the 3.9 stream!
Pulled, thanks Jeff.
^ permalink raw reply
* Re: [Patch net-next] netpoll: add RCU annotation to npinfo field
From: David Miller @ 2013-01-28 23:33 UTC (permalink / raw)
To: amwang; +Cc: netdev, eric.dumazet
In-Reply-To: <1358926179-7168-1-git-send-email-amwang@redhat.com>
From: Cong Wang <amwang@redhat.com>
Date: Wed, 23 Jan 2013 15:29:39 +0800
> From: Cong Wang <amwang@redhat.com>
>
> dev->npinfo is protected by RCU.
>
> This fixes the following sparse warnings:
>
> net/core/netpoll.c:177:48: error: incompatible types in comparison expression (different address spaces)
> net/core/netpoll.c:200:35: error: incompatible types in comparison expression (different address spaces)
> net/core/netpoll.c:221:35: error: incompatible types in comparison expression (different address spaces)
> net/core/netpoll.c:327:18: error: incompatible types in comparison expression (different address spaces)
>
> Cc: Eric Dumazet <eric.dumazet@gmail.com>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Cong Wang <amwang@redhat.com>
Applied.
^ permalink raw reply
* Re: [Patch net-next v2 1/2] netpoll: use ipv6_addr_equal() to compare ipv6 addr
From: David Miller @ 2013-01-28 23:33 UTC (permalink / raw)
To: amwang; +Cc: netdev
In-Reply-To: <1359338121-10897-1-git-send-email-amwang@redhat.com>
From: Cong Wang <amwang@redhat.com>
Date: Mon, 28 Jan 2013 09:55:20 +0800
> From: Cong Wang <amwang@redhat.com>
>
> ipv6_addr_equal() is faster.
>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Cong Wang <amwang@redhat.com>
Applied.
^ permalink raw reply
* Re: [Patch net-next v2 2/2] netpoll: use the net namespace of current process instead of init_net
From: David Miller @ 2013-01-28 23:33 UTC (permalink / raw)
To: amwang; +Cc: netdev, ebiederm
In-Reply-To: <1359338121-10897-2-git-send-email-amwang@redhat.com>
From: Cong Wang <amwang@redhat.com>
Date: Mon, 28 Jan 2013 09:55:21 +0800
> From: Cong Wang <amwang@redhat.com>
>
> This will allow us to setup netconsole in a different namespace
> rather than where init_net is.
>
> Cc: Eric W. Biederman <ebiederm@xmission.com>
> Cc: David S. Miller <davem@davemloft.net>
> Signed-off-by: Cong Wang <amwang@redhat.com>
Applied but:
> + if (np->dev_name) {
> + struct net *net = current->nsproxy->net_ns;
> + ndev = __dev_get_by_name(net, np->dev_name);
> + }
I wonder if you should be using task_nsproxy() here.
^ permalink raw reply
* Re: [net-next.git] net: phy: realtek: add rtl8211e driver
From: David Miller @ 2013-01-28 23:35 UTC (permalink / raw)
To: peppe.cavallaro; +Cc: netdev
In-Reply-To: <1358937003-19553-1-git-send-email-peppe.cavallaro@st.com>
From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Date: Wed, 23 Jan 2013 11:30:03 +0100
> This patch adds the minimal driver to manage the
> Realtek RTL8211E 10/100/1000 Transceivers.
>
> Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH net-next] drivers/net/ethernet/micrel/ks8851_mll: Implement basic statistics
From: David Miller @ 2013-01-28 23:39 UTC (permalink / raw)
To: David.Choi; +Cc: netdev, Ping.Doong, joe, bhutchings
In-Reply-To: <FD9AD8C5375B924CABC56D982DB3A802079D33CE@EXMB1.micrel.com>
From: "Choi, David" <David.Choi@Micrel.Com>
Date: Wed, 23 Jan 2013 18:46:37 +0000
> From: David J. Choi <david.choi@micrel.com>
>
> Summary of changes:
> add codes to collect basic statistical information about Ethernet packets.
This is awkward. Just state in sentences what is happening in the
commit.
There is no need for formalities like "and here comes the summary
of the changes" that's implicit in what this is, a commit log message.
> - if (likely(skb && (frame_hdr->sts & RXFSHR_RXFV) &&
> + if (unlikely(!skb)) {
> + /* discard the packet from the device */
> + ks_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_RRXEF);
> + netdev->stats.rx_dropped++;
> + }
> +
> + else if (likely((frame_hdr->sts & RXFSHR_RXFV) &&
> (frame_hdr->len < RX_BUF_SIZE) && frame_hdr->len)) {
Because this last condition goes from a plain
if ()
to
else if()
the next line is not not indented properly, you must fix that up.
Also, do not split up the closing brace and the next part of the
conditional as you did here, that's wrong. Do this:
} else if (...
Do not do this:
}
else if (...
You've been submitting patches way to long to be making so many
mistakes like this, my review efforts feel entirely wasted.
^ permalink raw reply
* Re: [PATCH net-next] drivers/net/phy/micrel_phy: Add support for new PHYs
From: David Miller @ 2013-01-28 23:42 UTC (permalink / raw)
To: David.Choi; +Cc: netdev, Ping.Doong, bhutchings
In-Reply-To: <FD9AD8C5375B924CABC56D982DB3A802079D346F@EXMB1.micrel.com>
From: "Choi, David" <David.Choi@Micrel.Com>
Date: Thu, 24 Jan 2013 00:05:15 +0000
> From: David J. Choi <david.choi@micrel.com>
>
> Summary of changes:
> .Newly added phys
> -KSZ8081/KSZ8091, which has some phy ids.
> -KSZ8061
> -KSZ9031, which is Gigabit phy.
> -KSZ886X, which has a switch function.
> -KSZ8031, which has a same phy ids with KSZ8021.
>
> Signed-off-by: David J. Choi <david.choi@micrel.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH v2 net-next] via-rhine: add 64bit statistics.
From: David Miller @ 2013-01-28 23:43 UTC (permalink / raw)
To: eric.dumazet; +Cc: jamie.gloudon, netdev
In-Reply-To: <1359005741.12374.1589.camel@edumazet-glaptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 23 Jan 2013 21:35:41 -0800
> On Thu, 2013-01-24 at 00:05 -0400, Jamie Gloudon wrote:
>> Switch to use ndo_get_stats64 to get 64bit statistics.
>>
>> Signed-off-by: Jamie Gloudon <jamie.gloudon@gmail.com>
>> Tested-by: Jamie Gloudon <jamie.gloudon@gmail.com>
>> ---
>> drivers/net/ethernet/via/via-rhine.c | 47 ++++++++++++++++++++++++++++++------
>> 1 file changed, 39 insertions(+), 8 deletions(-)
>
> Acked-by: Eric Dumazet <edumazet@google.com>
Applied, thanks.
^ permalink raw reply
* Re: [Patch net-next v2 2/2] netpoll: use the net namespace of current process instead of init_net
From: Eric W. Biederman @ 2013-01-29 0:18 UTC (permalink / raw)
To: David Miller; +Cc: amwang, netdev
In-Reply-To: <20130128.183338.211219305250941993.davem@davemloft.net>
David Miller <davem@davemloft.net> writes:
> From: Cong Wang <amwang@redhat.com>
> Date: Mon, 28 Jan 2013 09:55:21 +0800
>
>> From: Cong Wang <amwang@redhat.com>
>>
>> This will allow us to setup netconsole in a different namespace
>> rather than where init_net is.
>>
>> Cc: Eric W. Biederman <ebiederm@xmission.com>
>> Cc: David S. Miller <davem@davemloft.net>
>> Signed-off-by: Cong Wang <amwang@redhat.com>
>
> Applied but:
>
>> + if (np->dev_name) {
>> + struct net *net = current->nsproxy->net_ns;
>> + ndev = __dev_get_by_name(net, np->dev_name);
>> + }
>
> I wonder if you should be using task_nsproxy() here.
At a practical level using nsproxy straight is what we want here,
as nsproxy can not be changed by anything other than the current
process. So we have an implicit lock just by being the current
process.
Now there might be some set of rules for error checking that
I am not up to speed on that says because some paths that do
the rcu dance:
rcu_read_lock();
nsproxy = rcu_dereference(tsk->nsproxy);
net = get_net(nsproxy->net_ns);
rcu_read_lock();
That all paths have to do a companion rcu dance to say this is a
place where we don't need rcu protection because this is the
current process and we don't need an rcu_lock here.
If there is such a set of rules we have at least 24 other places
in the kernel that need to be fixed.
Eric
^ permalink raw reply
* Re: [PATCH] SCTP: Free the per-net sysctl table on net exit. v2
From: Eric W. Biederman @ 2013-01-29 0:20 UTC (permalink / raw)
To: Martin Mokrejs; +Cc: David Miller, vyasevich, netdev, linux-sctp
In-Reply-To: <5106ECCF.7080105@fold.natur.cuni.cz>
Martin Mokrejs <mmokrejs@fold.natur.cuni.cz> writes:
> Martin Mokrejs wrote:
>> Hi Eric,
>>
>> Eric W. Biederman wrote:
>>> Martin Mokrejs <mmokrejs@fold.natur.cuni.cz> writes:
>>>
>>>> David Miller wrote:
>>>>> From: ebiederm@xmission.com (Eric W. Biederman)
>>>>> Date: Sun, 27 Jan 2013 19:25:11 -0800
>>>>>
>>>>>> The typo is fixed in the patch this time in addition to my test
>>>>>> tree.
>>>>>
>>>>> Applied, thanks for fixing this up Eric.
>
>> So I haven't tested the patch yet. doh. Provided I am running 3 days without reproducing
>> the original memleak on an unpatched kernel I doubt I can easily prove it after a reboot.
>
> Umm, I spoke too early. It did happen again during these 3 days on unpatched 3.7.4:
>
> unreferenced object 0xffff880402769030 (size 2048):
> comm "chrome_sandbox", pid 4720, jiffies 4294966701 (age 285697.590s)
> hex dump (first 32 bytes):
> b2 68 89 81 ff ff ff ff 20 84 4f d8 03 88 ff ff .h...... .O.....
> 04 00 00 00 a4 01 00 00 00 00 00 00 00 00 00 00 ................
> backtrace:
> [<ffffffff815b4aad>] kmemleak_alloc+0x21/0x3e
> [<ffffffff81110352>] slab_post_alloc_hook+0x28/0x2a
> [<ffffffff81113fad>] __kmalloc_track_caller+0xf1/0x104
> [<ffffffff810f10c2>] kmemdup+0x1b/0x30
> [<ffffffff81571e9f>] sctp_sysctl_net_register+0x1f/0x72
> [<ffffffff8155d305>] sctp_net_init+0x100/0x39f
> [<ffffffff814ad53c>] ops_init+0xc6/0xf5
> [<ffffffff814ad5b7>] setup_net+0x4c/0xd0
> [<ffffffff814ada5e>] copy_net_ns+0x6d/0xd6
> [<ffffffff810938b1>] create_new_namespaces+0xd7/0x147
> [<ffffffff810939f4>] copy_namespaces+0x63/0x99
> [<ffffffff81076733>] copy_process+0xa65/0x1233
> [<ffffffff81077030>] do_fork+0x10b/0x271
> [<ffffffff8100a0e9>] sys_clone+0x23/0x25
> [<ffffffff815dda73>] stub_clone+0x13/0x20
> [<ffffffffffffffff>] 0xffffffffffffffff
>
> But I won't make it to a reboot in next 2-3 days to test the patch v2, sorry.
No biggy the logic remains the same and the fix in the patch is clrearly
needed from an inspection of the code.
Eric
^ permalink raw reply
* Re: [PATCH v5 31/45] blackfin/smp: Use get/put_online_cpus_atomic() to prevent CPU offline
From: Srivatsa S. Bhat @ 2013-01-29 1:14 UTC (permalink / raw)
To: Tejun Heo
Cc: Bob Liu, tglx, peterz, oleg, paulmck, rusty, mingo, akpm,
namhyung, rostedt, wangyun, xiaoguangrong, rjw, sbw, fweisbec,
linux, nikunj, linux-pm, linux-arch, linux-arm-kernel,
linuxppc-dev, netdev, linux-doc, linux-kernel
In-Reply-To: <CAOS58YN_r-ahRvPekOo_84bM7z3YcFw1EA7DcTf0NVyEhv7ssA@mail.gmail.com>
On 01/29/2013 06:06 AM, Tejun Heo wrote:
> Hello, Bob.
>
> On Mon, Jan 28, 2013 at 1:09 AM, Bob Liu <lliubbo@gmail.com> wrote:
>> Thanks, will be applied to my blackfin arch tree.
>
> I think we still have some work ahead of us to have this patchset
> ready for inclusion and even then it probably would be best to route
> these patches together, so probably not a very good idea to apply this
> to blackfin right now.
>
Thanks Tejun for pointing that out! I'll address the review comments
soon and respin the patchset.
Regards,
Srivatsa S. Bhat
^ permalink raw reply
* RE: [PATCH net-next] drivers/net/ethernet/micrel/ks8851_mll: Implement basic statistics
From: Choi, David @ 2013-01-29 1:21 UTC (permalink / raw)
To: David Miller
Cc: netdev@vger.kernel.org, Doong, Ping, joe@perches.com,
bhutchings@solarflare.com
In-Reply-To: <20130128.183941.768670834017645797.davem@davemloft.net>
Hi David Miller,
Thank you for your comments.
After receiving your reply, I check my patches that I have submitted.
On Jan. 23, I submitted my patches twice: One at 10:46AM, another at 11:36AM at my local time.
After submitting the first patch, Joe commented 2 issues that you mentioned.
-Indentation issue
-else if() issue
The 2nd patch resolved those 2 issues mentioned above.
I am pretty sure that your comment is based on my first patch on Jan 23.
I sent my 2nd patch to Joe@perches.com and you were in the loop. The reason why I sent to Joe was that he commented about my first patch.
Could you take a look at my last patch? If you want, I will submit it again.
Thank you for your effort and time.
Regards,
David J. Choi
-----Original Message-----
From: David Miller [mailto:davem@davemloft.net]
Sent: Monday, January 28, 2013 3:40 PM
To: Choi, David
Cc: netdev@vger.kernel.org; Doong, Ping; joe@perches.com; bhutchings@solarflare.com
Subject: Re: [PATCH net-next] drivers/net/ethernet/micrel/ks8851_mll: Implement basic statistics
From: "Choi, David" <David.Choi@Micrel.Com>
Date: Wed, 23 Jan 2013 18:46:37 +0000
> From: David J. Choi <david.choi@micrel.com>
>
> Summary of changes:
> add codes to collect basic statistical information about Ethernet packets.
This is awkward. Just state in sentences what is happening in the
commit.
There is no need for formalities like "and here comes the summary
of the changes" that's implicit in what this is, a commit log message.
> - if (likely(skb && (frame_hdr->sts & RXFSHR_RXFV) &&
> + if (unlikely(!skb)) {
> + /* discard the packet from the device */
> + ks_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_RRXEF);
> + netdev->stats.rx_dropped++;
> + }
> +
> + else if (likely((frame_hdr->sts & RXFSHR_RXFV) &&
> (frame_hdr->len < RX_BUF_SIZE) && frame_hdr->len)) {
Because this last condition goes from a plain
if ()
to
else if()
the next line is not not indented properly, you must fix that up.
Also, do not split up the closing brace and the next part of the
conditional as you did here, that's wrong. Do this:
} else if (...
Do not do this:
}
else if (...
You've been submitting patches way to long to be making so many
mistakes like this, my review efforts feel entirely wasted.
^ permalink raw reply
* Re: [PATCH net-next] drivers/net/ethernet/micrel/ks8851_mll: Implement basic statistics
From: Joe Perches @ 2013-01-29 1:34 UTC (permalink / raw)
To: Choi, David
Cc: netdev@vger.kernel.org, Doong, Ping, davem@davemloft.net,
bhutchings@solarflare.com
In-Reply-To: <FD9AD8C5375B924CABC56D982DB3A802079D340B@EXMB1.micrel.com>
On Wed, 2013-01-23 at 19:36 +0000, Choi, David wrote:
> From: David J. Choi <david.choi@micrel.com>
> --- net-next/drivers/net/ethernet/micrel/ks8851_mll.c.orig 2013-01-22 17:25:59.000000000 -0800
> + if (unlikely(!skb)) {
> + /* discard the packet from the device */
> + ks_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_RRXEF);
> + netdev->stats.rx_dropped++;
> + } else if (likely((frame_hdr->sts & RXFSHR_RXFV) &&
> (frame_hdr->len < RX_BUF_SIZE) && frame_hdr->len)) {
Just one small nit.
This would be better indented as:
} else if (likely((frame_hdr->sts & RXFSHR_RXFV) &&
frame_hdr->len > 0 &&
frame_hdr->len < RX_BUF_SIZE)) {
I do wonder why and when frame_hdr->len would be 0
and why the test is < RX_BUF_SIZE and not <=
^ 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;
as well as URLs for NNTP newsgroup(s).