Discussion:
[GIT]: Networking
(too old to reply)
David Miller
2009-03-23 08:40:53 UTC
Permalink
1) Driver bug fixes:

ucc_geth OOPS fix from Anton Vorontsov
dm9000 IRQ locking fix from David Brownell
IRQ handler selection fix in bnx2 from Michael Chan
sh_eth IRQ handler and register address fix from Nobuhiro Iwamatsu
tulip crash on interface up with shirq debug, from Kyle McMartin
be2net RX ring replenish under OOM fix from Sathya Perla
dnet build fix from Stephen Rothwell
sungem netdev_ops conversion regression fix from Stephen Hemminger
bas_gigaset USB transfer buffer allocation fix from Tilman Schmidt

2) SCTP byte swapping fix from Al Viro.

3) IP fragmentation network namespace OOPS fix from Jorge Boncompte

4) Legacy GRO input path crash fix from Herbert Xu.

5) Bonding speed/duplex update fix from Jay Vosburgh

6) kfree(skb) =3D=3D OOPS fix from Roel Kluin

7) SIT ipv6 tunnel regression fix wrt. netdev_ops conversion
from Bj=F8rn Mork

8) Wireless bug fixes from John Linville and the wireless crew.

9) Netfilter bug fixes from Christoph Paasch (conntrack packet dropping
and sanity check errors) and Pablo Neira Ayuso (conntrack netlink).

Please pull, thanks a lot!

The following changes since commit ee568b25ee9e160b32d1aef73d8b2ee9c05d=
34db:
Linus Torvalds (1):
Avoid 64-bit "switch()" statements on 32-bit architectures

are available in the git repository at:

master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Al Viro (1):
net: fix sctp breakage

Anton Vorontsov (1):
ucc_geth: Fix oops when using fixed-link support

Bj=F8rn Mork (1):
ipv6: fix display of local and remote sit endpoints

Christoph Paasch (2):
netfilter: conntrack: fix dropping packet after l4proto->packet()
netfilter: conntrack: check for NEXTHDR_NONE before header sanity=
checking

David Brownell (1):
dm9000: locking bugfix

David S. Miller (3):
Merge branch 'master' of git://git.kernel.org/.../kaber/nf-2.6
Merge branch 'master' of git://git.kernel.org/.../linville/wirele=
ss-2.6
Merge branch 'master' of git://git.kernel.org/.../linville/wirele=
ss-2.6

Herbert Xu (1):
gro: Fix legacy path napi_complete crash

Ilya Yanok (1):
dnet: DNET should depend on HAS_IOMEM

Jay Vosburgh (1):
bonding: Fix updating of speed/duplex changes

John W. Linville (1):
lib80211: silence excessive crypto debugging messages

Jorge Boncompte [DTI2] (1):
netns: oops in ip[6]_frag_reasm incrementing stats

Jouni Malinen (3):
mac80211: Fix panic on fragmentation with power saving
zd1211rw: Do not panic on device eject when associated
nl80211: Check that function pointer !=3D NULL before using it

Kyle McMartin (1):
tulip: fix crash on iface up with shirq debug

Luis R. Rodriguez (2):
ath9k: implement IO serialization
ath9k: AR9280 PCI devices must serialize IO as well

Maciej Sosnowski (1):
dca: add missing copyright/license headers

Michael Chan (1):
bnx2: Fix problem of using wrong IRQ handler.

Nobuhiro Iwamatsu (2):
sh_eth: Change handling of IRQ
sh_eth: Fix mistake of the address of SH7763

Pablo Neira Ayuso (2):
netfilter: conntrack: don't deliver events for racy packets
netfilter: ctnetlink: fix crash during expectation creation

Pantelis Koukousoulas (1):
virtio_net: Make virtio_net support carrier detection

Roel Kluin (1):
net: kfree(napi->skb) =3D> kfree_skb

Sathya Perla (2):
be2net: replenish when posting to rx-queue is starved in out of m=
em conditions
be2net: fix to restore vlan ids into BE2 during a IF DOWN->UP cyc=
le

Stanislaw Gruszka (1):
net: Document /proc/sys/net/core/netdev_budget

Stephen Hemminger (1):
sungem: missing net_device_ops

Stephen Rothwell (1):
net: update dnet.c for bus_id removal

Steve Glendinning (1):
smsc911x: reset last known duplex and carrier on open

Tilman Schmidt (1):
bas_gigaset: correctly allocate USB interrupt transfer buffer

Documentation/filesystems/proc.txt | 7 +++
drivers/dca/dca-sysfs.c | 21 ++++++++++
drivers/isdn/gigaset/bas-gigaset.c | 16 ++++++-
drivers/net/Kconfig | 2 +-
drivers/net/benet/be.h | 1 +
drivers/net/benet/be_main.c | 60 ++++++++++++++++-----=
-------
drivers/net/bnx2.c | 12 +++---
drivers/net/bonding/bond_main.c | 25 ++++++++++--
drivers/net/dm9000.c | 6 ++-
drivers/net/dnet.c | 6 +-
drivers/net/sh_eth.c | 20 ++++++++-
drivers/net/sh_eth.h | 4 +-
drivers/net/smsc911x.c | 4 ++
drivers/net/sungem.c | 9 ++--
drivers/net/tulip/tulip_core.c | 45 ++++++++++++++-------=
-
drivers/net/ucc_geth.c | 34 +++++-----------
drivers/net/ucc_geth.h | 3 +-
drivers/net/virtio_net.c | 3 +
drivers/net/wireless/ath9k/ath9k.h | 4 +-
drivers/net/wireless/ath9k/core.h | 33 ++++++++++++++++
drivers/net/wireless/ath9k/hw.c | 22 ++++++++++-
drivers/net/wireless/ath9k/main.c | 1 +
drivers/net/wireless/zd1211rw/zd_mac.c | 8 +++-
include/linux/dca.h | 20 ++++++++++
include/net/netfilter/nf_conntrack_core.h | 3 +-
net/core/dev.c | 7 ++-
net/ipv4/ip_fragment.c | 3 +-
net/ipv6/netfilter/nf_conntrack_reasm.c | 8 ++--
net/ipv6/reassembly.c | 7 +--
net/ipv6/sit.c | 2 +-
net/mac80211/tx.c | 2 +
net/netfilter/nf_conntrack_core.c | 2 +-
net/netfilter/nf_conntrack_netlink.c | 1 +
net/netfilter/nf_conntrack_proto_tcp.c | 4 +-
net/sctp/endpointola.c | 3 +-
net/wireless/Kconfig | 10 +++++
net/wireless/lib80211_crypt_ccmp.c | 2 +
net/wireless/lib80211_crypt_tkip.c | 4 ++
net/wireless/nl80211.c | 11 +++++
39 files changed, 314 insertions(+), 121 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller
2009-03-28 01:18:42 UTC
Permalink
Ok these are the remaining bits for the networking merge window
submission. There are some fixes for regressions from the pull from
two days ago as well.

1) Somehow Herbert's GRO fix slipped out of my tree the other
day. It's really here now, promise! :-)

2) smsc911x eeprom access fix from Steve Glendinning

3) ucc_geth PHY OOPS fixes from Anton Vorontsov

4) Rest of net_device_ops conversions that let x86 build with
all drivers enabled and the netdev method compat code disabled.
Nice work, Stephen Hemminger.

5) CXGB3 driver fixes from Divy Le Ray

6) OpenCores ethernet device driver from Thierry Reding.

7) Sync with the wireless folks, via John Linville.

8) Final netfilter updates from Patrick McHardy and crew. Patrick
is looking into a build failure reported by Randy Dunlap today
so we'll have a fix for that soon.

9) Two small appletalk/af_rose/x25 cures from Alan Cox. Someone is
certainly barnstorming the kernel bugzilla lately :-)

10) Accidental double spinlock in xfrm-state handling, oops. Fix from
Chuck Ebbert and that is definitely on the way to -stable.

11) Fix MIPS build failure, linux/netdevice.h needs linux/mm.h to get
page_address(). From Dmitri Vorobiev.

Please pull, thanks a lot!

The following changes since commit 0b4d569de222452bcb55a4a536ade6cf4d8d1e30:
Linus Torvalds (1):
i915: fix wrong 'size_t' format string

are available in the git repository at:

master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Abhijeet Kolekar (5):
iwl3945: set TFD_QUEUE_MAX to correct value
iwl3945: use iwl_cmd_queue_free
iwl3945: fix checkpatch.pl errors
iwl3945: control rate decrease
iwl3945: replace stations with stations_39

Alan Cox (2):
appletalk: this warning can go I think
af_rose/x25: Sanity check the maximum user frame size

Alina Friedrichsen (1):
mac80211: ieee80211_ibss_commit() cleanup

Anton Vorontsov (1):
ucc_geth: Fix three oopses in PHY {de,}initialization code

Bob Copeland (4):
ath5k: disable MIB interrupts
ath5k: remove dummy PCI "retry timeout" fix
ath5k: warn and correct rate for unknown hw rate indexes
ath5k: properly drop packets from ops->tx

Christian Lamparter (9):
p54: fix SoftLED compile dependencies
ar9170: hardware and eeprom header files
ar9170: ar9170: mac80211 interaction code
ar9170: mac/bbp and phy code
ar9170: ar9170: USB frontend driver
ar9170: update Makefile, Kconfig and MAINTAINERS
ar9170: simplify & deBUG tx_status queueing and reporting
p54: Kconfig maintenance
ar9170: single module build

Chuck Ebbert (1):
xfrm: spin_lock() should be spin_unlock() in xfrm_state.c

David S. Miller (6):
Merge branch 'master' of git://git.kernel.org/.../kaber/nf-next-2.6
gianfar: Fix kfree(skb)
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Revert "netrom: zero length frame filtering in NetRom"
Revert "ax25: zero length frame filtering in AX25"
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6

Divy Le Ray (5):
cxgb3: start qset timers when setup succeeded
cxgb3: sge setup fixes
cxgb3: use resource_size_t for mmio declarations
cxgb3: differentiate portx and Tx channels
cxgb3: map entire Rx page, feed map+offset to Rx ring.

Dmitri Vorobiev (1):
net: Add missing include into include/linux/netdevice.h

Eric Dumazet (3):
netfilter: nf_conntrack: use hlist_add_head_rcu() in nf_conntrack_set_hashsize()
netfilter: factorize ifname_compare()
netfilter: nf_conntrack: use SLAB_DESTROY_BY_RCU and get rid of call_rcu()

Geert Uytterhoeven (1):
wireless/p54: P54_SPI should depend on GENERIC_HARDIRQS

Helmut Schaa (1):
mac80211: start pending scan after probe/auth/assoc timed out

Herbert Xu (1):
GRO: Disable GRO on legacy netif_rx path

Holger Eitzenberger (7):
netfilter: ctnetlink: add callbacks to the per-proto nlattrs
netlink: add nla_policy_len()
netfilter: limit the length of the helper name
netfilter: ctnetlink: allocate right-sized ctnetlink skb
netfilter: nf_conntrack: add generic function to get len of generic policy
netfilter: nf_conntrack: calculate per-protocol nlattr size
ctnetlink: compute generic part of event more acurately

Ivo van Doorn (2):
rt2x00: Update MAINTAINERS entry: new mailinglist
rt2x00: New USB ID for rt73usb

Jesper Nilsson (1):
ipv6: Plug sk_buff leak in ipv6_rcv (net/ipv6/ip6_input.c)

Johannes Berg (24):
mac80211: remove ieee80211_num_regular_queues
mac80211: reduce max number of queues
mac80211: fix warnings in ieee80211_if_config
mac80211: stop queues across suspend/resume
wireless: radiotap updates
nl80211: export supported commands
mac80211: acquire sta_lock for station suspend/resume
ieee80211: document DS bit usage
nl80211: rework locking
mac80211: kill IEEE80211_CONF_SHORT_SLOT_TIME
mac80211: resume properly, add suspend/resume test
cfg80211: accept no-op interface mode changes
mac80211: remove mixed-cell and userspace MLME code
mac80211: rate control status only for controlled packets
mac80211: fix RX path
cfg80211: fix locking in nl80211_set_wiphy
mac80211: rewrite fragmentation
mac80211: fix A-MPDU queue assignment
mac80211: rework the pending packets code
mac80211: clean up __ieee80211_tx args
mac80211: unify and fix TX aggregation start
mac80211: add skb length sanity checking
mac80211: fix aggregation to not require queue stop
mac80211/iwlwifi: move virtual A-MDPU queue bookkeeping to iwlwifi

Jouni Malinen (10):
ath9k: Add support for multiple virtual AP interfaces
mac80211: Fix a typo in assoc vs. reassoc check
mac80211: Fix reassociation by not clearing previous BSSID
nl80211: Event notifications for MLME events
nl80211: Add MLME primitives to support external SME
mac80211: Fix memleak in nl80211 authentication on deinit
nl80211: Remove NL80211_CMD_SET_MGMT_EXTRA_IE
nl80211: Add more through validation of MLME command parameters
nl80211: Check that netif_runnin is true in cfg80211 code
nl80211: Check iftype in cfg80211 code

Kalle Valo (6):
mac80211: don't drop nullfunc frames during software scan
mac80211: decrease execution of the associated timer
mac80211: track beacons separately from the rx path activity
mac80211: disable power save when scanning
cfg80211: add feature to hold bss
mac80211: add beacon filtering support

Li Yang (1):
gianfar: only check headroom when FCB is needed

Lorenzo Nava (1):
b43: fix b43_plcp_get_bitrate_idx_ofdm return type

Luis R. Rodriguez (8):
ath9k: remove dummy PCI "retry timeout" fix
mac80211_hwsim: let the reg workqueue breathe when regtest is set
cfg80211: force last_request to be set for OLD_REG if regdom is EU
cfg80211: fix incorrect assumption on last_request for 11d
cfg80211: make regdom module parameter available oustide of OLD_REG
cfg80211: remove code about country IE support with OLD_REG
ath9k: fix dma mapping leak of rx buffer upon rmmod
cfg80211: default CONFIG_WIRELESS_OLD_REGULATORY to n

Michael Buesch (3):
b43: Mask PHY TX error interrupt, if not debugging
ssb: remove EXPERIMENTAL dependencies.
b43: Add BCM4307 PCI-ID

Mohamed Abbas (5):
iwlagn: use changed in mac_config
iwl3945: use changed in iwl3945_mac_config
iwlagn: allow power level setting all the times
iwlcore: dont commit power command if interface is not up
iwlwifi: support 11h

Nick Kossifidis (3):
ath5k: Choose the right initvals for RF2425
ath5k: Convert chip specific calibration data to a generic format
ath5k: Add tx power calibration support

Pat Erley (1):
Add mesh point functionality to ath9k

Patrick McHardy (2):
netfilter: fix xt_LED build failure
netfilter: {ip,ip6,arp}_tables: fix incorrect loop detection

Reinette Chatre (1):
cfg80211/nl80211: remove usage of CONFIG_NL80211

Stephen Hemminger (32):
benet: use do_div() for 64 bit divide
gianfar: fix headroom expansion code
3c503, smc-ultra: netdev_ops bugs
uml: convert network device to internal network device stats
uml: convert network device to netdevice ops
appletalk: convert cops to internal net_device_stats
appltetalk: convert cops device to net_device ops
appletalk: convert LTPC to use internal net_device_stats
appletalk: convert LTPC to net_device_ops
IRDA: convert donauboe to net_device_ops
tokenring: convert drivers to net_device_ops
tokenring: convert smctr to net_device_ops
wan: convert sdla driver to net_device_ops
wireless: convert arlan to net_device_ops
wireless: convert wavelan to net_device_ops
netdev: seeq8005 convert to net_device_ops
netdev: smc9194 convert to net_device_ops
netdev: smc-ultra32 convert to net_device_ops
netdev: smc-ultra fix netpoll
lance: convert to net_device_ops
netdev: ibmlana convert to net_device_ops
netdev: convert eexpress to net_device_ops
netdev: convert eexpro to net_device_ops
netdev: convert at1700 to net_device_ops
netdev: convert depca to net_device_ops
netdev: convert ewrk3 to net_device_ops
netdev: convert ni52 to net_device_ops
netdev: convert ni65 to net_device_ops
netdev: convert ac3200 to net_device_ops
netdev: convert lp486e to net_device_ops
netdev: convert cs89x0 to net_device_ops
netdev: convert eth16i to net_device_ops

Steve Glendinning (1):
smsc911x: enforce read-after-write timing restriction on eeprom access

Sujith (9):
ath9k: Miscellaneous EEPROM handling cleanup
ath9k: Move AR5416_VER_MASK to a common location
ath9k: Introduce a helper function for setting board gain values
ath9k: Change return type for set_board_values()
ath9k: Fix bug in 4K EEPROM size calculation
ath9k: Fill in ack signal in TX status
ath9k: Fix bug in handling single stream stations
ath9k: Update copyright in all the files
mac80211: Tear down aggregation sessions for suspend/resume

Thierry Reding (1):
net: Add support for the OpenCores 10/100 Mbps Ethernet MAC.

Tulio Magno Quites Machado Filho (1):
ath5k: Support LED's on Acer Extensa 5620z

Vasanthakumar Thiagarajan (6):
ath9k: Set IEEE80211_TX_CTL_RATE_CTRL_PROBE in rate control for probe rate
mac80211: Populate HT limitation with TKIP/WEP to the handler for SIOCSIWENCODE too
ath9k: Keep LED on in idle state after association
ath9k: Fix rate control update for aggregated frames
ath9k: Fix bug in reporting status of tx rate
ath9k: Nuke struct ath_xmit_status

Wey-Yi Guy (3):
iwlwifi: return 0 for AMPDU_TX/RX_STOP request if NIC is going down
iwlwifi: report error when detect failure during stop agg queue
iwlwifi: show current driver status in user readable format

Documentation/DocBook/mac80211.tmpl | 6 +
Documentation/feature-removal-schedule.txt | 37 +-
MAINTAINERS | 10 +-
arch/um/drivers/net_kern.c | 39 +-
arch/um/include/shared/net_kern.h | 2 +-
drivers/net/3c503.c | 3 -
drivers/net/Kconfig | 8 +
drivers/net/Makefile | 1 +
drivers/net/ac3200.c | 22 +-
drivers/net/appletalk/cops.c | 45 +-
drivers/net/appletalk/ltpc.c | 38 +-
drivers/net/at1700.c | 19 +-
drivers/net/benet/be_main.c | 28 +-
drivers/net/cs89x0.c | 28 +-
drivers/net/cxgb3/adapter.h | 4 +
drivers/net/cxgb3/common.h | 4 +-
drivers/net/cxgb3/cxgb3_main.c | 12 +-
drivers/net/cxgb3/sge.c | 164 ++-
drivers/net/cxgb3/t3_hw.c | 80 +-
drivers/net/depca.c | 19 +-
drivers/net/eepro.c | 17 +-
drivers/net/eexpress.c | 17 +-
drivers/net/eth16i.c | 18 +-
drivers/net/ethoc.c | 1112 +++++++++++++
drivers/net/ewrk3.c | 19 +-
drivers/net/gianfar.c | 48 +-
drivers/net/ibmlana.c | 17 +-
drivers/net/irda/donauboe.c | 12 +-
drivers/net/lance.c | 19 +-
drivers/net/lp486e.c | 17 +-
drivers/net/ni52.c | 21 +-
drivers/net/ni65.c | 75 +-
drivers/net/seeq8005.c | 17 +-
drivers/net/smc-ultra.c | 5 +-
drivers/net/smc-ultra32.c | 23 +-
drivers/net/smc9194.c | 17 +-
drivers/net/smsc911x.c | 5 +
drivers/net/tokenring/madgemc.c | 11 +-
drivers/net/tokenring/proteon.c | 9 +-
drivers/net/tokenring/skisa.c | 9 +-
drivers/net/tokenring/smctr.c | 16 +-
drivers/net/ucc_geth.c | 21 +-
drivers/net/wan/sdla.c | 36 +-
drivers/net/wireless/Kconfig | 1 +
drivers/net/wireless/Makefile | 1 +
drivers/net/wireless/ar9170/Kconfig | 17 +
drivers/net/wireless/ar9170/Makefile | 3 +
drivers/net/wireless/ar9170/ar9170.h | 209 +++
drivers/net/wireless/ar9170/cmd.c | 129 ++
drivers/net/wireless/ar9170/cmd.h | 91 ++
drivers/net/wireless/ar9170/eeprom.h | 179 +++
drivers/net/wireless/ar9170/hw.h | 417 +++++
drivers/net/wireless/ar9170/led.c | 171 ++
drivers/net/wireless/ar9170/mac.c | 452 ++++++
drivers/net/wireless/ar9170/main.c | 1671 ++++++++++++++++++++
drivers/net/wireless/ar9170/phy.c | 1240 +++++++++++++++
drivers/net/wireless/ar9170/usb.c | 748 +++++++++
drivers/net/wireless/ar9170/usb.h | 74 +
drivers/net/wireless/arlan-main.c | 21 +-
drivers/net/wireless/ath5k/ath5k.h | 35 +-
drivers/net/wireless/ath5k/attach.c | 2 +
drivers/net/wireless/ath5k/base.c | 46 +-
drivers/net/wireless/ath5k/base.h | 2 +-
drivers/net/wireless/ath5k/desc.c | 4 +
drivers/net/wireless/ath5k/eeprom.c | 774 +++++++---
drivers/net/wireless/ath5k/eeprom.h | 128 +-
drivers/net/wireless/ath5k/initvals.c | 4 +-
drivers/net/wireless/ath5k/led.c | 2 +
drivers/net/wireless/ath5k/phy.c | 1170 +++++++++++++-
drivers/net/wireless/ath5k/reg.h | 19 +
drivers/net/wireless/ath5k/reset.c | 35 +-
drivers/net/wireless/ath9k/ahb.c | 2 +-
drivers/net/wireless/ath9k/ani.c | 2 +-
drivers/net/wireless/ath9k/ani.h | 2 +-
drivers/net/wireless/ath9k/ath9k.h | 9 +-
drivers/net/wireless/ath9k/beacon.c | 56 +-
drivers/net/wireless/ath9k/calib.c | 2 +-
drivers/net/wireless/ath9k/calib.h | 2 +-
drivers/net/wireless/ath9k/debug.c | 2 +-
drivers/net/wireless/ath9k/debug.h | 2 +-
drivers/net/wireless/ath9k/eeprom.c | 308 ++---
drivers/net/wireless/ath9k/eeprom.h | 5 +-
drivers/net/wireless/ath9k/hw.c | 14 +-
drivers/net/wireless/ath9k/hw.h | 2 +-
drivers/net/wireless/ath9k/initvals.h | 2 +-
drivers/net/wireless/ath9k/mac.c | 2 +-
drivers/net/wireless/ath9k/mac.h | 2 +-
drivers/net/wireless/ath9k/main.c | 47 +-
drivers/net/wireless/ath9k/pci.c | 20 +-
drivers/net/wireless/ath9k/phy.c | 2 +-
drivers/net/wireless/ath9k/phy.h | 2 +-
drivers/net/wireless/ath9k/rc.c | 23 +-
drivers/net/wireless/ath9k/rc.h | 2 +-
drivers/net/wireless/ath9k/recv.c | 9 +-
drivers/net/wireless/ath9k/reg.h | 2 +-
drivers/net/wireless/ath9k/regd.c | 2 +-
drivers/net/wireless/ath9k/regd.h | 2 +-
drivers/net/wireless/ath9k/regd_common.h | 2 +-
drivers/net/wireless/ath9k/xmit.c | 78 +-
drivers/net/wireless/b43/main.c | 2 +
drivers/net/wireless/b43/xmit.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 2 +-
drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 13 +-
drivers/net/wireless/iwlwifi/iwl-3945.c | 24 +-
drivers/net/wireless/iwlwifi/iwl-4965.c | 7 +-
drivers/net/wireless/iwlwifi/iwl-5000.c | 9 +-
drivers/net/wireless/iwlwifi/iwl-agn.c | 179 ++-
drivers/net/wireless/iwlwifi/iwl-core.c | 8 +-
drivers/net/wireless/iwlwifi/iwl-core.h | 1 +
drivers/net/wireless/iwlwifi/iwl-debugfs.c | 54 +-
drivers/net/wireless/iwlwifi/iwl-dev.h | 6 +
drivers/net/wireless/iwlwifi/iwl-helpers.h | 52 +
drivers/net/wireless/iwlwifi/iwl-power.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-sta.c | 4 +-
drivers/net/wireless/iwlwifi/iwl-tx.c | 18 +-
drivers/net/wireless/iwlwifi/iwl3945-base.c | 38 +-
drivers/net/wireless/libertas/radiotap.h | 10 -
drivers/net/wireless/libertas/rx.c | 12 +-
drivers/net/wireless/mac80211_hwsim.c | 4 +-
drivers/net/wireless/p54/Kconfig | 39 +-
drivers/net/wireless/p54/p54common.c | 16 +-
drivers/net/wireless/rt2x00/rt73usb.c | 2 +
drivers/net/wireless/wavelan.c | 79 +-
drivers/net/wireless/wavelan.p.h | 9 +-
drivers/ssb/Kconfig | 16 +-
drivers/ssb/b43_pci_bridge.c | 1 +
include/linux/ieee80211.h | 17 +
include/linux/if_frad.h | 1 -
include/linux/netdevice.h | 1 +
include/linux/netfilter/x_tables.h | 23 +
include/linux/nl80211.h | 88 +-
include/linux/pci_ids.h | 2 +
include/net/cfg80211.h | 203 +++-
include/net/ethoc.h | 22 +
include/net/ieee80211_radiotap.h | 4 +-
include/net/mac80211.h | 84 +-
include/net/netfilter/nf_conntrack.h | 14 +-
include/net/netfilter/nf_conntrack_helper.h | 2 +
include/net/netfilter/nf_conntrack_l3proto.h | 7 +
include/net/netfilter/nf_conntrack_l4proto.h | 7 +
include/net/netfilter/nf_conntrack_tuple.h | 6 +-
include/net/netlink.h | 1 +
include/net/netns/conntrack.h | 5 +-
lib/nlattr.c | 27 +
net/appletalk/ddp.c | 6 +-
net/ax25/af_ax25.c | 12 -
net/core/dev.c | 9 +-
net/ipv4/netfilter/arp_tables.c | 18 +-
net/ipv4/netfilter/ip_tables.c | 27 +-
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 +
.../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 63 +-
net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 6 +
net/ipv4/netfilter/nf_nat_core.c | 2 +-
net/ipv6/ip6_input.c | 4 +-
net/ipv6/netfilter/ip6_tables.c | 27 +-
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 6 +
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 6 +
net/mac80211/agg-rx.c | 8 +
net/mac80211/agg-tx.c | 232 ++--
net/mac80211/cfg.c | 245 ++--
net/mac80211/debugfs.c | 24 +
net/mac80211/ibss.c | 3 +-
net/mac80211/ieee80211_i.h | 78 +-
net/mac80211/iface.c | 14 +-
net/mac80211/main.c | 25 +-
net/mac80211/mlme.c | 259 +++-
net/mac80211/pm.c | 78 +-
net/mac80211/rate.c | 6 +-
net/mac80211/rate.h | 4 +-
net/mac80211/rx.c | 29 +-
net/mac80211/scan.c | 77 +-
net/mac80211/sta_info.c | 17 +-
net/mac80211/sta_info.h | 7 +-
net/mac80211/tx.c | 579 ++++---
net/mac80211/util.c | 126 +--
net/mac80211/wep.c | 21 +-
net/mac80211/wext.c | 33 +-
net/mac80211/wpa.c | 28 +-
net/netfilter/Kconfig | 2 +-
net/netfilter/nf_conntrack_core.c | 129 +-
net/netfilter/nf_conntrack_expect.c | 2 +-
net/netfilter/nf_conntrack_helper.c | 8 +-
net/netfilter/nf_conntrack_netlink.c | 94 +-
net/netfilter/nf_conntrack_proto.c | 16 +
net/netfilter/nf_conntrack_proto_dccp.c | 9 +
net/netfilter/nf_conntrack_proto_gre.c | 1 +
net/netfilter/nf_conntrack_proto_sctp.c | 10 +
net/netfilter/nf_conntrack_proto_tcp.c | 15 +
net/netfilter/nf_conntrack_proto_udp.c | 2 +
net/netfilter/nf_conntrack_proto_udplite.c | 1 +
net/netfilter/nf_conntrack_standalone.c | 57 +-
net/netfilter/xt_connlimit.c | 6 +-
net/netfilter/xt_physdev.c | 21 +-
net/netrom/af_netrom.c | 17 +-
net/rose/af_rose.c | 4 +
net/wireless/Kconfig | 44 +-
net/wireless/Makefile | 3 +-
net/wireless/core.c | 30 +-
net/wireless/core.h | 5 +
net/wireless/mlme.c | 46 +
net/wireless/nl80211.c | 824 ++++++++--
net/wireless/nl80211.h | 38 +-
net/wireless/reg.c | 65 +-
net/wireless/scan.c | 27 +-
net/wireless/wext-compat.c | 11 +-
net/x25/af_x25.c | 6 +
net/xfrm/xfrm_state.c | 2 +-
207 files changed, 12318 insertions(+), 2765 deletions(-)
create mode 100644 drivers/net/ethoc.c
create mode 100644 drivers/net/wireless/ar9170/Kconfig
create mode 100644 drivers/net/wireless/ar9170/Makefile
create mode 100644 drivers/net/wireless/ar9170/ar9170.h
create mode 100644 drivers/net/wireless/ar9170/cmd.c
create mode 100644 drivers/net/wireless/ar9170/cmd.h
create mode 100644 drivers/net/wireless/ar9170/eeprom.h
create mode 100644 drivers/net/wireless/ar9170/hw.h
create mode 100644 drivers/net/wireless/ar9170/led.c
create mode 100644 drivers/net/wireless/ar9170/mac.c
create mode 100644 drivers/net/wireless/ar9170/main.c
create mode 100644 drivers/net/wireless/ar9170/phy.c
create mode 100644 drivers/net/wireless/ar9170/usb.c
create mode 100644 drivers/net/wireless/ar9170/usb.h
create mode 100644 include/net/ethoc.h
create mode 100644 net/wireless/mlme.c
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller
2009-03-30 00:13:50 UTC
Permalink
1) net_device_ops conversion and some fixups from Alexander
Beregalov

2) netfilter build failure fix from Pedro Neira Ayuso

3) Missing kernel-doc fix from Randy Dunlap

4) Use-after-release bug fixes in gianfar and ucc_geth

5) Endianness cures and cleanups from Harvey Harrison

6) Add GRO support to two drivers.

Please pull, thanks a lot!

The following changes since commit 07d43ba98621f08e252a48c96b258b4d572b0257:
Linus Torvalds (1):
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

are available in the git repository at:

master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Alexander Beregalov (3):
ni5010: convert to net_device_ops
dmascc: fix incomplete conversion to network_device_ops
wireless: remove duplicated .ndo_set_mac_address

David S. Miller (5):
gianfar: Fix use-after-of_node_put() in gfar_of_init().
ucc_geth: Fix use-after-of_node_put() in ucc_geth_probe().
niu: Add GRO support.
tg3: Add GRO support.
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Harvey Harrison (3):
netfilter: fix endian bug in conntrack printks
netpoll: store local and remote ip in net-endian
kernel: remove HIPQUAD()

Herbert Xu (1):
gso: Fix support for linear packets

Pablo Neira Ayuso (1):
netfilter: xtables: fix IPv6 dependency in the cluster match

Randy Dunlap (1):
skbuff.h: fix missing kernel-doc

drivers/net/gianfar.c | 2 +-
drivers/net/hamradio/dmascc.c | 2 +-
drivers/net/netconsole.c | 10 +++-----
drivers/net/ni5010.c | 18 +++++++++++-----
drivers/net/niu.c | 12 ++++++----
drivers/net/tg3.c | 4 +-
drivers/net/ucc_geth.c | 11 +++++----
drivers/net/wireless/airo.c | 2 -
drivers/net/wireless/ipw2x00/ipw2200.c | 1 -
drivers/net/wireless/prism54/islpci_dev.c | 1 -
drivers/net/wireless/zd1201.c | 1 -
include/linux/kernel.h | 12 -----------
include/linux/netpoll.h | 2 +-
include/linux/skbuff.h | 1 +
net/core/netpoll.c | 31 ++++++++++++++---------------
net/core/skbuff.c | 2 +-
net/netfilter/nf_conntrack_irc.c | 15 +++++++------
net/netfilter/xt_cluster.c | 11 ++++++++-
18 files changed, 68 insertions(+), 70 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller
2009-04-03 00:15:29 UTC
Permalink
Several fixes and small cures, including:

1) Need BH disabling in netfilter RCU sequences, fix from
Eric Dumazet. This hit quite a few folks.

2) ixgb/igb bug fixes from the Intel folks via Jeff Kirsher.

3) RDS bug fixes from Andy Grover, including one for the build
failures on some 32-bit systems.

4) TCP packet counting bug fix from Ilpo J=E4rvinen.

5) HSO bug fixes and device ID additions from Jan Dumon.

6) New VXGE driver from Ramkrishna Vepa.

7) Three request_firmware driver conversions from Jaswinder Singh
Rajput.

Please pull, thanks a lot!

The following changes since commit 833bb3046b6cb320e775ea2160ddca87d532=
60d5:
Alexey Dobriyan (1):
serial: fixup /proc/tty/driver/serial after proc_fops conversio=
n

are available in the git repository at:

master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Alan Carvalho de Assis (1):
i.MX31: Fixing cs89x0 network building to i.MX31ADS

Alexander Duyck (6):
igb: add support for x2 link width configurations
igb: set num_rx/tx_queues to 0 when queues are freed
igb: increase delay for copper link setup
igb: cleanup igb loopback path
ixgbe: fix build when DEBUG is defined
ixgbe: refactor tx buffer processing to use skb_dma_map/unmap

Andy Grover (3):
RDS: Fix m_rs_lock deadlock
RDS: Rewrite connection cleanup, fixing oops on rmmod
RDS: Use spinlock to protect 64b value update on 32b archs

Anton Vorontsov (2):
ucc_geth: Pass proper device to DMA routines, otherwise oops happ=
ens
fsl_pq_mdio: Revive UCC MDIO support

Atsushi Nemoto (1):
tc35815: Fix build error if NAPI enabled

Ben Hutchings (1):
sfc: Call netif_napi_add() before registering our interrupt handl=
er

David S. Miller (1):
Merge branch 'master' of git://git.kernel.org/.../jaswinder/net-n=
ext-2.6

Don Skidmore (3):
ixgbe: Fix ethtool output with advertised mode.
ixgbe: feature - driver to default with FC on.
ixgbe: fix ethtool -A|a behavior

Eric Dumazet (1):
netfilter: use rcu_read_bh() in ipt_do_table()

Grant Likely (2):
net/fec_mpc52xx: fix BUG on missing dma_ops
net/fec_mpc52xx: Don't dereference phy_device if it is NULL

Heiko Carstens (1):
ETHOC: fix build breakage on s390

Henk Stegeman (1):
net/fec_mpc52xx: Migrate to net_device_ops.

Huang Weiyi (2):
dnet: remove unused #include <version.h>
glge: remove unused #include <version.h>

Ilpo J=E4rvinen (2):
tcp: add helper for counter tweaking due mid-wq change
tcp: miscounts due to tcp_fragment pcount reset

Jan Dumon (3):
hso: add Vendor/Product ID's for new devices
hso: fix for crash when unplugging the device
hso: fix for the 'invalid frame length' messages

Jaswinder Singh Rajput (3):
yam: use request_firmware
3C359: use request_firmware
smc91c92_cs: use request_firmware

Karsten Wiese (1):
r8169: reset IntrStatus after chip reset

Kumar Gala (2):
gianfar: Remove unused header
ucc_geth: Remove unused header

Larry Finger (1):
kaweth: Fix locking to be SMP-safe

Mallikarjuna R Chilakala (2):
ixgbe: Patch to fix driver panic while freeing up tx & rx resourc=
es
ixgbe: Fix potential memory leak/driver panic issue while setting=
up Tx & Rx ring parameters

PJ Waskiewicz (2):
ixgbe: Fix DCB netlink layer for 82599 to enable Priority Flow Co=
ntrol
ixgbe: Fix 82598 MSI-X allocation on systems with more than 8 CPU=
cores

Rafael J. Wysocki (1):
net/igb: Fix kexec with igb (rev. 3)

Rami Rosen (1):
ipv4: remove unused parameter from tcp_recv_urg().

Ramkrishna Vepa (9):
Neterion: Driver help file
Neterion: New driver: Update Maintainer list
Neterion: New driver: register set - vxge-reg.h
Neterion: New driver: Hardware init & configuration
Neterion: New driver: Traffic & alarm handler
Neterion: New driver: Main entry points
Neterion: New driver: Ethtool related
Neterion: New driver: Driver version
Neterion: New driver: Kconfig and Makefile

Segher Boessenkool (1):
fsl_pq_mdio: Fix compile failure

Stephen Hemminger (1):
net: allow multiple dev per napi with GRO

Wei Yongjun (1):
core: remove pointless conditional before kfree()

Documentation/networking/vxge.txt | 100 +
MAINTAINERS | 7 +-
drivers/net/Kconfig | 19 +-
drivers/net/Makefile | 1 +
drivers/net/dnet.c | 1 -
drivers/net/fec_mpc52xx.c | 77 +-
drivers/net/fsl_pq_mdio.c | 3 +-
drivers/net/gianfar.h | 1 -
drivers/net/hamradio/yam.c | 64 +-
drivers/net/hamradio/yam1200.h | 343 --
drivers/net/hamradio/yam9600.h | 343 --
drivers/net/igb/e1000_phy.c | 7 +-
drivers/net/igb/igb_ethtool.c | 14 +-
drivers/net/igb/igb_main.c | 54 +-
drivers/net/ixgbe/ixgbe_82598.c | 3 +-
drivers/net/ixgbe/ixgbe_common.c | 3 +-
drivers/net/ixgbe/ixgbe_common.h | 9 +-
drivers/net/ixgbe/ixgbe_dcb_nl.c | 6 +-
drivers/net/ixgbe/ixgbe_ethtool.c | 129 +-
drivers/net/ixgbe/ixgbe_main.c | 110 +-
drivers/net/ixgbe/ixgbe_type.h | 1 +
drivers/net/pcmcia/ositech.h | 358 ---
drivers/net/pcmcia/smc91c92_cs.c | 44 +-
drivers/net/qlge/qlge_ethtool.c | 1 -
drivers/net/r8169.c | 5 +-
drivers/net/sfc/efx.c | 7 +-
drivers/net/tc35815.c | 2 +-
drivers/net/tokenring/3c359.c | 63 +-
drivers/net/tokenring/3c359.h | 3 +
drivers/net/tokenring/3c359_microcode.h | 1581 ----------
drivers/net/ucc_geth.c | 22 +-
drivers/net/ucc_geth.h | 4 +-
drivers/net/ucc_geth_ethtool.c | 1 -
drivers/net/usb/hso.c | 40 +-
drivers/net/usb/kaweth.c | 7 +-
drivers/net/vxge/Makefile | 7 +
drivers/net/vxge/vxge-config.c | 5264 +++++++++++++++++++++++=
++++++++
drivers/net/vxge/vxge-config.h | 2259 +++++++++++++
drivers/net/vxge/vxge-ethtool.c | 1148 +++++++
drivers/net/vxge/vxge-ethtool.h | 67 +
drivers/net/vxge/vxge-main.c | 4502 +++++++++++++++++++++++=
+++
drivers/net/vxge/vxge-main.h | 557 ++++
drivers/net/vxge/vxge-reg.h | 4608 +++++++++++++++++++++++=
++++
drivers/net/vxge/vxge-traffic.c | 2528 +++++++++++++++
drivers/net/vxge/vxge-traffic.h | 2409 ++++++++++++++
drivers/net/vxge/vxge-version.h | 23 +
firmware/3com/3C359.bin.ihex | 1573 +++++++++
firmware/Makefile | 3 +
firmware/WHENCE | 50 +
firmware/ositech/Xilinx7OD.bin.ihex | 177 ++
firmware/yam/1200.bin.ihex | 342 ++
firmware/yam/9600.bin.ihex | 342 ++
include/net/tcp.h | 15 -
net/core/dev.c | 5 +-
net/core/ethtool.c | 3 +-
net/ipv4/netfilter/arp_tables.c | 4 +-
net/ipv4/netfilter/ip_tables.c | 4 +-
net/ipv4/tcp.c | 5 +-
net/ipv4/tcp_output.c | 73 +-
net/ipv6/netfilter/ip6_tables.c | 4 +-
net/rds/ib.c | 5 +-
net/rds/ib.h | 28 +-
net/rds/ib_cm.c | 43 +-
net/rds/ib_rdma.c | 43 +-
net/rds/ib_recv.c | 37 +-
net/rds/iw.c | 5 +-
net/rds/iw.h | 28 +-
net/rds/iw_cm.c | 44 +-
net/rds/iw_rdma.c | 44 +-
net/rds/iw_recv.c | 37 +-
net/rds/rds.h | 4 +
net/rds/send.c | 6 +-
72 files changed, 26689 insertions(+), 3040 deletions(-)
create mode 100644 Documentation/networking/vxge.txt
delete mode 100644 drivers/net/hamradio/yam1200.h
delete mode 100644 drivers/net/hamradio/yam9600.h
delete mode 100644 drivers/net/pcmcia/ositech.h
delete mode 100644 drivers/net/tokenring/3c359_microcode.h
create mode 100644 drivers/net/vxge/Makefile
create mode 100644 drivers/net/vxge/vxge-config.c
create mode 100644 drivers/net/vxge/vxge-config.h
create mode 100644 drivers/net/vxge/vxge-ethtool.c
create mode 100644 drivers/net/vxge/vxge-ethtool.h
create mode 100644 drivers/net/vxge/vxge-main.c
create mode 100644 drivers/net/vxge/vxge-main.h
create mode 100644 drivers/net/vxge/vxge-reg.h
create mode 100644 drivers/net/vxge/vxge-traffic.c
create mode 100644 drivers/net/vxge/vxge-traffic.h
create mode 100644 drivers/net/vxge/vxge-version.h
create mode 100644 firmware/3com/3C359.bin.ihex
create mode 100644 firmware/ositech/Xilinx7OD.bin.ihex
create mode 100644 firmware/yam/1200.bin.ihex
create mode 100644 firmware/yam/9600.bin.ihex
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller
2009-04-05 00:17:13 UTC
Permalink
1) E1000 multicast packet loss fix from Jesse Brandeburg.

2) Two request_firmware() conversions (myri_sbus and bnx2)

3) B44 DMA fix from Michael Buesch. This also could explain a bunch
of bugs actually.

4) Use percpu_add() instead of by hand expansion, from Eric Dumazet.

5) vxge build fix from Alexander Beregalov.

6) virtio_net MAC setting fix from Alex Willaimson.

Please pull, thanks a lot!

The following changes since commit 6bb597507f9839b13498781e481f5458aea33620:
Linus Torvalds (1):
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip

are available in the git repository at:

master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Alex Williamson (1):
virtio_net: Set the mac config only when VIRITO_NET_F_MAC

Alexander Beregalov (1):
vxge: should include tcp.h

Eric Dumazet (1):
socket: use percpu_add() while updating sockets_in_use

Jaswinder Singh Rajput (1):
myri_sbus: use request_firmware

Jesse Brandeburg (1):
e1000: fix loss of multicast packets

Michael Buesch (1):
b44: Fix sizes passed to b44_sync_dma_desc_for_{device,cpu}()

Michael Chan (1):
bnx2: Use request_firmware()

drivers/net/Kconfig | 2 +-
drivers/net/b44.c | 6 +-
drivers/net/bnx2.c | 351 ++-
drivers/net/bnx2.h | 71 +-
drivers/net/bnx2_fw.h | 4378 +----------------------
drivers/net/bnx2_fw2.h | 4547 ----------------------
drivers/net/e1000/e1000_main.c | 34 +-
drivers/net/myri_code.h | 5006 -------------------------
drivers/net/myri_sbus.c | 37 +-
drivers/net/virtio_net.c | 10 +-
drivers/net/vxge/vxge-main.c | 1 +
firmware/Makefile | 5 +
firmware/WHENCE | 30 +
firmware/bnx2/bnx2-mips-06-4.6.16.fw.ihex | 5805 ++++++++++++++++++++++++++++
firmware/bnx2/bnx2-mips-09-4.6.17.fw.ihex | 5816 +++++++++++++++++++++++++++++
firmware/bnx2/bnx2-rv2p-06-4.6.16.fw.ihex | 441 +++
firmware/bnx2/bnx2-rv2p-09-4.6.15.fw.ihex | 490 +++
firmware/myricom/lanai.bin.ihex | 4771 +++++++++++++++++++++++
net/socket.c | 6 +-
19 files changed, 17671 insertions(+), 14136 deletions(-)
delete mode 100644 drivers/net/bnx2_fw2.h
delete mode 100644 drivers/net/myri_code.h
create mode 100644 firmware/bnx2/bnx2-mips-06-4.6.16.fw.ihex
create mode 100644 firmware/bnx2/bnx2-mips-09-4.6.17.fw.ihex
create mode 100644 firmware/bnx2/bnx2-rv2p-06-4.6.16.fw.ihex
create mode 100644 firmware/bnx2/bnx2-rv2p-09-4.6.15.fw.ihex
create mode 100644 firmware/myricom/lanai.bin.ihex
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller
2009-04-07 00:57:52 UTC
Permalink
1) E1000 multicast packet loss fix from Jesse Brandeburg.

2) Two request_firmware() conversions (myri_sbus and bnx2)

3) Two B44 DMA fixes from Michael Buesch. These could explain a bunch
of strange bugs actually.

4) Use percpu_add() instead of by hand expansion, from Eric Dumazet.

5) vxge build fix from Alexander Beregalov.

6) virtio_net MAC setting fix from Alex Willaimson.

7) IPSEC ipv6 tunnel fragmentation bug fix from Steffen Klassert.

8) gigaset driver bug fixes from Tilman Schmidt.

9) axnet_cs PHY detection bug fixes from Ken Kawasaki.

10) Missing MODULE_LICENSE in fddi module.

Please pull, thanks a lot!

The following changes since commit 6bb597507f9839b13498781e481f5458aea33620:
Linus Torvalds (1):
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip

are available in the git repository at:

master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Adrian Bunk (1):
net/802/fddi.c: add MODULE_LICENSE

Alex Williamson (1):
virtio_net: Set the mac config only when VIRITO_NET_F_MAC

Alexander Beregalov (1):
vxge: should include tcp.h

Ed Swierk (1):
forcedeth: Fix resume from hibernation regression.

Eric Dumazet (1):
socket: use percpu_add() while updating sockets_in_use

Huang Weiyi (1):
smsc911x: remove unused #include <linux/version.h>

Jaswinder Singh Rajput (1):
myri_sbus: use request_firmware

Jean Delvare (1):
ibm_newemac: Fix dangerous struct assumption

Jesse Brandeburg (1):
e1000: fix loss of multicast packets

Ken Kawasaki (1):
axnet_cs: fix phy_id detection for bogus Asix chip.

Michael Buesch (2):
b44: Fix sizes passed to b44_sync_dma_desc_for_{device,cpu}()
b44: Use kernel DMA addresses for the kernel DMA API

Michael Chan (1):
bnx2: Use request_firmware()

Steffen Klassert (1):
xfrm: fix fragmentation on inter family tunnels

Tilman Schmidt (3):
bas_gigaset: use tasklet_hi_schedule for timing critical tasklets
gigaset: in file ops, check for device disconnect before anything else
gigaset: documentation update

Documentation/isdn/README.gigaset | 52 +-
drivers/isdn/gigaset/bas-gigaset.c | 4 +-
drivers/isdn/gigaset/interface.c | 58 +-
drivers/net/Kconfig | 2 +-
drivers/net/b44.c | 8 +-
drivers/net/bnx2.c | 351 ++-
drivers/net/bnx2.h | 71 +-
drivers/net/bnx2_fw.h | 4378 +----------------------
drivers/net/bnx2_fw2.h | 4547 ----------------------
drivers/net/e1000/e1000_main.c | 34 +-
drivers/net/forcedeth.c | 3 +
drivers/net/ibm_newemac/core.c | 2 +-
drivers/net/myri_code.h | 5006 -------------------------
drivers/net/myri_sbus.c | 37 +-
drivers/net/pcmcia/axnet_cs.c | 9 +-
drivers/net/smsc911x.c | 1 -
drivers/net/virtio_net.c | 10 +-
drivers/net/vxge/vxge-main.c | 1 +
firmware/Makefile | 5 +
firmware/WHENCE | 30 +
firmware/bnx2/bnx2-mips-06-4.6.16.fw.ihex | 5805 ++++++++++++++++++++++++++++
firmware/bnx2/bnx2-mips-09-4.6.17.fw.ihex | 5816 +++++++++++++++++++++++++++++
firmware/bnx2/bnx2-rv2p-06-4.6.16.fw.ihex | 441 +++
firmware/bnx2/bnx2-rv2p-09-4.6.15.fw.ihex | 490 +++
firmware/myricom/lanai.bin.ihex | 4771 +++++++++++++++++++++++
net/802/fddi.c | 2 +
net/ipv6/xfrm6_output.c | 1 +
net/socket.c | 6 +-
28 files changed, 17751 insertions(+), 14190 deletions(-)
delete mode 100644 drivers/net/bnx2_fw2.h
delete mode 100644 drivers/net/myri_code.h
create mode 100644 firmware/bnx2/bnx2-mips-06-4.6.16.fw.ihex
create mode 100644 firmware/bnx2/bnx2-mips-09-4.6.17.fw.ihex
create mode 100644 firmware/bnx2/bnx2-rv2p-06-4.6.16.fw.ihex
create mode 100644 firmware/bnx2/bnx2-rv2p-09-4.6.15.fw.ihex
create mode 100644 firmware/myricom/lanai.bin.ihex
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Linus Torvalds
2009-04-07 01:25:31 UTC
Permalink
The sky2 driver is buggered (by the previous pull, I presume). Some PCI
interaction. NULL pointer dereference at boot.

Linus
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Jesse Barnes
2009-04-07 01:33:24 UTC
Permalink
On Mon, 6 Apr 2009 18:25:31 -0700 (PDT)
Post by Linus Torvalds
The sky2 driver is buggered (by the previous pull, I presume). Some
PCI interaction. NULL pointer dereference at boot.
Hopefully fixed by this patch in my for-linus branch?
--
Jesse Barnes, Intel Open Source Technology Center

commit d6141668c24d7d75c3486499c05a6b382cbc2bbe
Author: Anton Vorontsov <***@ru.mvista.com>
Date: Wed Apr 1 02:23:41 2009 +0400

PCI: Fix oops in pci_vpd_truncate

pci_vpd_truncate() should check for dev->vpd->attr, otherwise
this might happen:

sky2 driver version 1.22
Unable to handle kernel paging request for data at address 0x0000000c
Faulting instruction address: 0xc01836fc
Oops: Kernel access of bad area, sig: 11 [#1]
[...]
NIP [c01836fc] pci_vpd_truncate+0x38/0x40
LR [c029be18] sky2_probe+0x14c/0x518
Call Trace:
[ef82bde0] [c029bda4] sky2_probe+0xd8/0x518 (unreliable)
[ef82be20] [c018a11c] local_pci_probe+0x24/0x34
[ef82be30] [c018a14c] pci_call_probe+0x20/0x30
[ef82be50] [c018a330] __pci_device_probe+0x64/0x78
[ef82be60] [c018a44c] pci_device_probe+0x30/0x58
[ef82be80] [c01aa270] really_probe+0x78/0x1a0
[ef82bea0] [c01aa460] __driver_attach+0xa4/0xa8
[ef82bec0] [c01a96ac] bus_for_each_dev+0x60/0x9c
[ef82bef0] [c01aa0b4] driver_attach+0x24/0x34
[ef82bf00] [c01a9e08] bus_add_driver+0x12c/0x1cc
[ef82bf20] [c01aa87c] driver_register+0x6c/0x110
[ef82bf30] [c018a770] __pci_register_driver+0x4c/0x9c
[ef82bf50] [c03782c8] sky2_init_module+0x30/0x40
[ef82bf60] [c0001dbc] do_one_initcall+0x34/0x1a0
[ef82bfd0] [c0362240] do_initcalls+0x38/0x58

This happens with CONFIG_SKY2=y, and "ip=on" kernel command line, so
pci_vpd_truncate() is called before late_initcall(pci_sysfs_init),
therefore ->attr isn't yet initialized.

Acked-by: Stephen Hemminger <***@vyatta.com>
Signed-off-by: Anton Vorontsov <***@ru.mvista.com>
Signed-off-by: Jesse Barnes <***@virtuousgeek.org>

diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 3814447..64dd7df 100644
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -356,7 +356,8 @@ int pci_vpd_truncate(struct pci_dev *dev, size_t size)
return -EINVAL;

dev->vpd->len = size;
- dev->vpd->attr->size = size;
+ if (dev->vpd->attr)
+ dev->vpd->attr->size = size;

return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller
2009-04-07 02:07:45 UTC
Permalink
From: Linus Torvalds <***@linux-foundation.org>
Date: Mon, 6 Apr 2009 18:25:31 -0700 (PDT)
Post by Linus Torvalds
The sky2 driver is buggered (by the previous pull, I presume). Some PCI
interaction. NULL pointer dereference at boot.
Fixed in the PCI tree, have you pulled that one yet?
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Linus Torvalds
2009-04-07 02:32:11 UTC
Permalink
Post by David Miller
Date: Mon, 6 Apr 2009 18:25:31 -0700 (PDT)
Post by Linus Torvalds
The sky2 driver is buggered (by the previous pull, I presume). Some PCI
interaction. NULL pointer dereference at boot.
Fixed in the PCI tree, have you pulled that one yet?
Nobody has even _asked_ me to pull.

What's the point of having fixes available if they aren't merged?

Linus
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Jesse Barnes
2009-04-07 03:24:41 UTC
Permalink
On Mon, 6 Apr 2009 19:32:11 -0700 (PDT)
Post by Linus Torvalds
Post by David Miller
Date: Mon, 6 Apr 2009 18:25:31 -0700 (PDT)
Post by Linus Torvalds
The sky2 driver is buggered (by the previous pull, I presume).
Some PCI interaction. NULL pointer dereference at boot.
Fixed in the PCI tree, have you pulled that one yet?
Nobody has even _asked_ me to pull.
What's the point of having fixes available if they aren't merged?
I just pushed it into my repo today and wanted at least a day of
linux-next before asking you to pull.
--
Jesse Barnes, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
David Miller
2009-04-07 04:04:26 UTC
Permalink
From: Jesse Barnes <***@virtuousgeek.org>
Date: Mon, 6 Apr 2009 20:24:41 -0700
Post by Jesse Barnes
On Mon, 6 Apr 2009 19:32:11 -0700 (PDT)
Post by Linus Torvalds
Post by David Miller
Date: Mon, 6 Apr 2009 18:25:31 -0700 (PDT)
Post by Linus Torvalds
The sky2 driver is buggered (by the previous pull, I presume).
Some PCI interaction. NULL pointer dereference at boot.
Fixed in the PCI tree, have you pulled that one yet?
Nobody has even _asked_ me to pull.
What's the point of having fixes available if they aren't merged?
I just pushed it into my repo today and wanted at least a day of
linux-next before asking you to pull.
I feel like I've been watching people get pointed to that fix
for what seems like days.

In fact this is why I was under the impression that you had
already asked Linus to merge the fix. :-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Jesse Barnes
2009-04-07 16:04:29 UTC
Permalink
On Mon, 06 Apr 2009 21:04:26 -0700 (PDT)
Post by David Miller
Date: Mon, 6 Apr 2009 20:24:41 -0700
Post by Jesse Barnes
On Mon, 6 Apr 2009 19:32:11 -0700 (PDT)
Post by Linus Torvalds
Post by David Miller
Date: Mon, 6 Apr 2009 18:25:31 -0700 (PDT)
Post by Linus Torvalds
The sky2 driver is buggered (by the previous pull, I presume).
Some PCI interaction. NULL pointer dereference at boot.
Fixed in the PCI tree, have you pulled that one yet?
Nobody has even _asked_ me to pull.
What's the point of having fixes available if they aren't merged?
I just pushed it into my repo today and wanted at least a day of
linux-next before asking you to pull.
I feel like I've been watching people get pointed to that fix
for what seems like days.
In fact this is why I was under the impression that you had
already asked Linus to merge the fix. :-)
It came in right as I was putting together my tree for the merge
window; putting it in along with a few other fixes would have meant a
delay to do more testing etc so I figured I'd put it off until now.
Sorry about that; I didn't know so many people were running into it.
--
Jesse Barnes, Intel Open Source Technology Center
David Miller
2009-04-08 23:08:09 UTC
Permalink
A build fix here, a chip reset fix there, and the new
virtual-function IGB driver from Intel.

Plus three netfilter bug fixes from Patrick McHardy.

Please pull, thanks a lot!

The following changes since commit 577c9c456f0e1371cbade38eaf91ae8e8a308555:
Linus Torvalds (1):
Linux 2.6.30-rc1

are available in the git repository at:

master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Alex Riesen (1):
netfilter: fix selection of "LED" target in netfilter

Alexander Duyck (2):
igbvf: add new driver to support 82576 virtual functions
igb: remove sysfs entry that was used to set the number of vfs

Bastian Blank (1):
bnx2: Don't use reserved names

Dan Carpenter (1):
niu: Fix error handling

David S. Miller (2):
Merge branch 'master' of git://git.kernel.org/.../kaber/nf-2.6
niu: Fix unused variable warning.

Eric Dumazet (1):
netfilter: ip6tables regression fix

Florian Fainelli (1):
r6040: set MODULE_VERSION

Lennert Buytenhek (1):
mv643xx_eth: don't reset the rx coal timer on interface up

Pablo Neira Ayuso (1):
netfilter: ctnetlink: fix regression in expectation handling

Randy Dunlap (1):
ethoc: fix library build errors

Sascha Hauer (1):
FEC driver: add missing #endif

Steve Glendinning (1):
smsc911x: correct debugging message on mii read timeout

Yang Hongyang (1):
drivers/net/eql.c: Fix a dev leakage.

drivers/net/Kconfig | 23 +
drivers/net/Makefile | 1 +
drivers/net/bnx2.c | 26 +-
drivers/net/eql.c | 2 +
drivers/net/fec.c | 1 +
drivers/net/igb/igb_main.c | 159 +-
drivers/net/igbvf/Makefile | 38 +
drivers/net/igbvf/defines.h | 125 ++
drivers/net/igbvf/ethtool.c | 540 +++++
drivers/net/igbvf/igbvf.h | 335 +++
drivers/net/igbvf/mbx.c | 350 ++++
drivers/net/igbvf/mbx.h | 75 +
drivers/net/igbvf/netdev.c | 2919 +++++++++++++++++++++++++++
drivers/net/igbvf/regs.h | 108 +
drivers/net/igbvf/vf.c | 398 ++++
drivers/net/igbvf/vf.h | 265 +++
drivers/net/mv643xx_eth.c | 4 +-
drivers/net/niu.c | 3 +-
drivers/net/r6040.c | 1 +
drivers/net/smsc911x.c | 2 +-
include/net/netfilter/nf_conntrack_expect.h | 5 +-
net/ipv6/netfilter/ip6_tables.c | 2 +
net/netfilter/Kconfig | 2 +-
net/netfilter/nf_conntrack_expect.c | 30 +-
24 files changed, 5266 insertions(+), 148 deletions(-)
create mode 100644 drivers/net/igbvf/Makefile
create mode 100644 drivers/net/igbvf/defines.h
create mode 100644 drivers/net/igbvf/ethtool.c
create mode 100644 drivers/net/igbvf/igbvf.h
create mode 100644 drivers/net/igbvf/mbx.c
create mode 100644 drivers/net/igbvf/mbx.h
create mode 100644 drivers/net/igbvf/netdev.c
create mode 100644 drivers/net/igbvf/regs.h
create mode 100644 drivers/net/igbvf/vf.c
create mode 100644 drivers/net/igbvf/vf.h
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to ***@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Continue reading on narkive:
Loading...