Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e387fcd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (56 commits)
  l2tp: Fix possible oops if transmitting or receiving when tunnel goes down
  tcp: Fix for race due to temporary drop of the socket lock in skb_splice_bits.
  tcp: Increment OUTRSTS in tcp_send_active_reset()
  raw: Raw socket leak.
  lt2p: Fix possible WARN_ON from socket code when UDP socket is closed
  USB ID for Philips CPWUA054/00 Wireless USB Adapter 11g
  ssb: Fix context assertion in ssb_pcicore_dev_irqvecs_enable
  libertas: fix command size for CMD_802_11_SUBSCRIBE_EVENT
  ipw2200: expire and use oldest BSS on adhoc create
  airo warning fix
  b43legacy: Fix controller restart crash
  sctp: Fix ECN markings for IPv6
  sctp: Flush the queue only once during fast retransmit.
  sctp: Start T3-RTX timer when fast retransmitting lowest TSN
  sctp: Correctly implement Fast Recovery cwnd manipulations.
  sctp: Move sctp_v4_dst_saddr out of loop
  sctp: retran_path update bug fix
  tcp: fix skb vs fack_count out-of-sync condition
  sunhme: Cleanup use of deprecated calls to save_and_cli and restore_flags.
  xfrm: xfrm_algo: correct usage of RIPEMD-160
  ...
parents 9489a062 24b95685

Documentation/networking/bridge.txt

+1 −1
Original line number Diff line number Diff line 
In order to use the Ethernet bridging functionality, you'll need the

userspace tools. These programs and documentation are available

at http://bridge.sourceforge.net.  The download page is

at http://www.linux-foundation.org/en/Net:Bridge.  The download page is

http://prdownloads.sourceforge.net/bridge.



If you still have questions, don't hesitate to post to the mailing list

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1611,7 +1611,7 @@ ETHERNET BRIDGE 
P:	Stephen Hemminger

M:	shemminger@linux-foundation.org

L:	bridge@lists.linux-foundation.org

W:	http://bridge.sourceforge.net/

W:	http://www.linux-foundation.org/en/Net:Bridge

S:	Maintained



ETHERTEAM 16I DRIVER

drivers/net/atlx/atl1.c

+1 −0
Original line number Diff line number Diff line
@@ -2023,6 +2023,7 @@ rrd_ok: 
		/* Good Receive */

		pci_unmap_page(adapter->pdev, buffer_info->dma,

			       buffer_info->length, PCI_DMA_FROMDEVICE);

		buffer_info->dma = 0;

		skb = buffer_info->skb;

		length = le16_to_cpu(rrd->xsz.xsum_sz.pkt_size);

drivers/net/cs89x0.c

+7 −3
Original line number Diff line number Diff line
@@ -1394,6 +1394,10 @@ net_open(struct net_device *dev) 
#endif

        if (!result) {

                printk(KERN_ERR "%s: EEPROM is configured for unavailable media\n", dev->name);

release_dma:

#if ALLOW_DMA

		free_dma(dev->dma);

#endif

release_irq:

#if ALLOW_DMA

		release_dma_buff(lp);
@@ -1442,12 +1446,12 @@ net_open(struct net_device *dev) 
			if ((result = detect_bnc(dev)) != DETECTED_NONE)

				break;

		printk(KERN_ERR "%s: no media detected\n", dev->name);

                goto release_irq;

		goto release_dma;

	}

	switch(result) {

	case DETECTED_NONE:

		printk(KERN_ERR "%s: no network cable attached to configured media\n", dev->name);

                goto release_irq;

		goto release_dma;

	case DETECTED_RJ45H:

		printk(KERN_INFO "%s: using half-duplex 10Base-T (RJ-45)\n", dev->name);

		break;

drivers/net/myri10ge/myri10ge.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
#include "myri10ge_mcp.h"

#include "myri10ge_mcp_gen_header.h"



#define MYRI10GE_VERSION_STR "1.3.2-1.287"

#define MYRI10GE_VERSION_STR "1.3.99-1.347"



MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");

MODULE_AUTHOR("Maintainer: help@myri.com");