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

Commit 95dfec6a 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: (53 commits)
  tcp: Overflow bug in Vegas
  [IPv4] UFO: prevent generation of chained skb destined to UFO device
  iwlwifi: move the selects to the tristate drivers
  ipv4: annotate a few functions __init in ipconfig.c
  atm: ambassador: vcc_sf semaphore to mutex
  MAINTAINERS: The socketcan-core list is subscribers-only.
  netfilter: nf_conntrack: padding breaks conntrack hash on ARM
  ipv4: Update MTU to all related cache entries in ip_rt_frag_needed()
  sch_sfq: use del_timer_sync() in sfq_destroy()
  net: Add compat support for getsockopt (MCAST_MSFILTER)
  net: Several cleanups for the setsockopt compat support.
  ipvs: fix oops in backup for fwmark conn templates
  bridge: kernel panic when unloading bridge module
  bridge: fix error handling in br_add_if()
  netfilter: {nfnetlink,ip,ip6}_queue: fix skb_over_panic when enlarging packets
  netfilter: x_tables: fix net namespace leak when reading /proc/net/xxx_tables_names
  netfilter: xt_TCPOPTSTRIP: signed tcphoff for ipv6_skip_exthdr() retval
  tcp: Limit cwnd growth when deferring for GSO
  tcp: Allow send-limited cwnd to grow up to max_burst when gso disabled
  [netdrvr] gianfar: Determine TBIPA value dynamically
  ...
parents ae3a0064 15913114

MAINTAINERS

+8 −1
Original line number Diff line number Diff line
@@ -1039,7 +1039,7 @@ P: Urs Thuermann 
M:	urs.thuermann@volkswagen.de

P:	Oliver Hartkopp

M:	oliver.hartkopp@volkswagen.de

L:	socketcan-core@lists.berlios.de

L:	socketcan-core@lists.berlios.de (subscribers-only)

W:	http://developer.berlios.de/projects/socketcan/

S:	Maintained
@@ -3577,6 +3577,13 @@ M: pfg@sgi.com 
L:	linux-ia64@vger.kernel.org

S:	Supported



SFC NETWORK DRIVER

P:	Steve Hodgson

P:	Ben Hutchings

P:	Robert Stonehouse

M:	linux-net-drivers@solarflare.com

S:	Supported



SGI VISUAL WORKSTATION 320 AND 540

P:	Andrey Panin

M:	pazke@donpac.ru

arch/arm/mach-ixp4xx/ixp4xx_npe.c

+4 −0
Original line number Diff line number Diff line
@@ -448,7 +448,9 @@ int npe_send_message(struct npe *npe, const void *msg, const char *what) 
		return -ETIMEDOUT;

	}



#if DEBUG_MSG > 1

	debug_msg(npe, "Sending a message took %i cycles\n", cycles);

#endif

	return 0;

}
@@ -484,7 +486,9 @@ int npe_recv_message(struct npe *npe, void *msg, const char *what) 
		return -ETIMEDOUT;

	}



#if DEBUG_MSG > 1

	debug_msg(npe, "Receiving a message took %i cycles\n", cycles);

#endif

	return 0;

}

arch/arm/mach-ixp4xx/ixp4xx_qmgr.c

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ void qmgr_release_queue(unsigned int queue) 
	case 3: mask[0] = 0xFF; break;

	}



	mask[1] = mask[2] = mask[3] = 0;



	while (addr--)

		shift_mask(mask);

drivers/atm/ambassador.c

+10 −9
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/interrupt.h>

#include <linux/poison.h>

#include <linux/bitrev.h>

#include <linux/mutex.h>



#include <asm/atomic.h>

#include <asm/io.h>
@@ -1177,7 +1178,7 @@ static int amb_open (struct atm_vcc * atm_vcc) 
    

    vcc->tx_frame_bits = tx_frame_bits;

    

    down (&dev->vcc_sf);

    mutex_lock(&dev->vcc_sf);

    if (dev->rxer[vci]) {

      // RXer on the channel already, just modify rate...

      cmd.request = cpu_to_be32 (SRB_MODIFY_VC_RATE);
@@ -1203,7 +1204,7 @@ static int amb_open (struct atm_vcc * atm_vcc) 
	schedule();

    }

    dev->txer[vci].tx_present = 1;

    up (&dev->vcc_sf);

    mutex_unlock(&dev->vcc_sf);

  }

  

  if (rxtp->traffic_class != ATM_NONE) {
@@ -1211,7 +1212,7 @@ static int amb_open (struct atm_vcc * atm_vcc) 
    

    vcc->rx_info.pool = pool;

    

    down (&dev->vcc_sf); 

    mutex_lock(&dev->vcc_sf);

    /* grow RX buffer pool */

    if (!dev->rxq[pool].buffers_wanted)

      dev->rxq[pool].buffers_wanted = rx_lats;
@@ -1237,7 +1238,7 @@ static int amb_open (struct atm_vcc * atm_vcc) 
      schedule();

    // this link allows RX frames through

    dev->rxer[vci] = atm_vcc;

    up (&dev->vcc_sf);

    mutex_unlock(&dev->vcc_sf);

  }

  

  // indicate readiness
@@ -1262,7 +1263,7 @@ static void amb_close (struct atm_vcc * atm_vcc) { 
  if (atm_vcc->qos.txtp.traffic_class != ATM_NONE) {

    command cmd;

    

    down (&dev->vcc_sf);

    mutex_lock(&dev->vcc_sf);

    if (dev->rxer[vci]) {

      // RXer still on the channel, just modify rate... XXX not really needed

      cmd.request = cpu_to_be32 (SRB_MODIFY_VC_RATE);
@@ -1277,7 +1278,7 @@ static void amb_close (struct atm_vcc * atm_vcc) { 
    dev->txer[vci].tx_present = 0;

    while (command_do (dev, &cmd))

      schedule();

    up (&dev->vcc_sf);

    mutex_unlock(&dev->vcc_sf);

  }

  

  // disable RXing
@@ -1287,7 +1288,7 @@ static void amb_close (struct atm_vcc * atm_vcc) { 
    // this is (the?) one reason why we need the amb_vcc struct

    unsigned char pool = vcc->rx_info.pool;

    

    down (&dev->vcc_sf);

    mutex_lock(&dev->vcc_sf);

    if (dev->txer[vci].tx_present) {

      // TXer still on the channel, just go to pool zero XXX not really needed

      cmd.request = cpu_to_be32 (SRB_MODIFY_VC_FLAGS);
@@ -1314,7 +1315,7 @@ static void amb_close (struct atm_vcc * atm_vcc) { 
      dev->rxq[pool].buffers_wanted = 0;

      drain_rx_pool (dev, pool);

    }

    up (&dev->vcc_sf);

    mutex_unlock(&dev->vcc_sf);

  }

  

  // free our structure
@@ -2188,7 +2189,7 @@ static void setup_dev(amb_dev *dev, struct pci_dev *pci_dev) 
      

      // semaphore for txer/rxer modifications - we cannot use a

      // spinlock as the critical region needs to switch processes

      init_MUTEX (&dev->vcc_sf);

      mutex_init(&dev->vcc_sf);

      // queue manipulation spinlocks; we want atomic reads and

      // writes to the queue descriptors (handles IRQ and SMP)

      // consider replacing "int pending" -> "atomic_t available"

drivers/atm/ambassador.h

+1 −1
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ struct amb_dev { 
  amb_txq          txq;

  amb_rxq          rxq[NUM_RX_POOLS];

  

  struct semaphore vcc_sf;

  struct mutex     vcc_sf;

  amb_tx_info      txer[NUM_VCS];

  struct atm_vcc * rxer[NUM_VCS];

  unsigned int     tx_avail;