• L
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 2f2c7795
    Linus Torvalds 提交于
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits)
      ctcm: rename READ/WRITE defines to avoid redefinitions
      claw: rename READ/WRITE defines to avoid redefinitions
      phylib: available for any speed ethernet
      can: add limit for nframes and clean up signed/unsigned variables
      pkt_sched: Check .walk and .leaf class handlers
      pkt_sched: Fix sch_sfq vs tc_modify_qdisc oops
      caif-spi: Bugfix SPI_DATA_POS settings were inverted.
      caif: Bugfix - Increase default headroom size for control channel.
      net: make netpoll_rx return bool for !CONFIG_NETPOLL
      Bluetooth: Use 3-DH5 payload size for default ERTM max PDU size
      Bluetooth: Fix incorrect setting of remote_tx_win for L2CAP ERTM
      Bluetooth: Change default L2CAP ERTM retransmit timeout
      Bluetooth: Fix endianness issue with L2CAP MPS configuration
      net: Use NET_XMIT_SUCCESS where possible.
      isdn: mISDN: call pci_disable_device() if pci_probe() failed
      isdn: avm: call pci_disable_device() if pci_probe() failed
      isdn: avm: call pci_disable_device() if pci_probe() failed
      usbnet: rx_submit() should return an error code.
      pkt_sched: Add some basic qdisc class ops verification. Was: [PATCH] sfq: add dummy bind/unbind handles
      pkt_sched: sch_sfq: Add dummy unbind_tcf and put handles. Was: [PATCH] sfq: add dummy bind/unbind handles
      ...
    2f2c7795
cfg.c 52.2 KB