Commit f7f866ee 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: (42 commits)
  net: Fix routing tables with id > 255 for legacy software
  sky2: Hold RTNL while calling dev_close()
  s2io iomem annotations
  atl1: fix suspend regression
  qeth: start dev queue after tx drop error
  qeth: Prepare-function to call s390dbf was wrong
  qeth: reduce number of kernel messages
  qeth: Use ccw_device_get_id().
  qeth: layer 3 Oops in ip event handler
  virtio: use callback on empty in virtio_net
  virtio: virtio_net free transmit skbs in a timer
  virtio: Fix typo in virtio_net_hdr comments
  virtio_net: Fix skb->csum_start computation
  ehea: set mac address fix
  sfc: Recover from RX queue flush failure
  add missing lance_* exports
  ixgbe: fix typo
  forcedeth: msi interrupts
  ipsec: pfkey should ignore events when no listeners
  pppoe: Unshare skb before anything else
  ...
parents 7427d8b8 513fd370

drivers/atm/eni.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include "midway.h"





#define KERNEL_OFFSET	0xC0000000	/* kernel 0x0 is at phys 0xC0000000 */

#define DEV_LABEL	"eni"



#define UBR_BUFFER	(128*1024)	/* UBR buffer size */

drivers/isdn/hardware/eicon/divasmain.c

+0 −1
Original line number Diff line number Diff line
@@ -806,7 +806,6 @@ static int DIVA_INIT_FUNCTION divas_init(void) 


	if (!create_divas_proc()) {

#ifdef MODULE

		remove_divas_proc();

		divas_unregister_chrdev();

		divasfunc_exit();

#endif

drivers/isdn/hardware/eicon/divasproc.c

+2 −2
Original line number Diff line number Diff line
@@ -125,8 +125,8 @@ static const struct file_operations divas_fops = { 


int create_divas_proc(void)

{

	proc_create(divas_proc_name, S_IFREG | S_IRUGO, proc_net_eicon,

		    &divas_fops);

	divas_proc_entry = proc_create(divas_proc_name, S_IFREG | S_IRUGO,

					proc_net_eicon, &divas_fops);

	if (!divas_proc_entry)

		return (0);

drivers/isdn/hysdn/hysdn_procconf.c

+8 −21
Original line number Diff line number Diff line
@@ -210,27 +210,14 @@ static ssize_t 
hysdn_conf_read(struct file *file, char __user *buf, size_t count, loff_t *off)

{

	char *cp;

	int i;



	if (file->f_mode & FMODE_READ) {

	if (!(file->f_mode & FMODE_READ))

		return -EPERM;	/* no permission to read */



	if (!(cp = file->private_data))

			return (-EFAULT);	/* should never happen */

		i = strlen(cp);	/* get total string length */

		if (*off < i) {

			/* still bytes to transfer */

			cp += *off;	/* point to desired data offset */

			i -= *off;	/* remaining length */

			if (i > count)

				i = count;	/* limit length to transfer */

			if (copy_to_user(buf, cp, i))

				return (-EFAULT);	/* copy error */

			*off += i;	/* adjust offset */

		} else

			return (0);

	} else

		return (-EPERM);	/* no permission to read */

		return -EFAULT;	/* should never happen */



	return (i);

	return simple_read_from_buffer(buf, count, off, cp, strlen(cp));

}				/* hysdn_conf_read */



/******************/

drivers/net/7990.c

+5 −1
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ int lance_open (struct net_device *dev) 


	return res;

}

EXPORT_SYMBOL_GPL(lance_open);



int lance_close (struct net_device *dev)

{
@@ -521,6 +522,7 @@ int lance_close (struct net_device *dev) 


        return 0;

}

EXPORT_SYMBOL_GPL(lance_close);



void lance_tx_timeout(struct net_device *dev)

{
@@ -529,7 +531,7 @@ void lance_tx_timeout(struct net_device *dev) 
	dev->trans_start = jiffies;

	netif_wake_queue (dev);

}



EXPORT_SYMBOL_GPL(lance_tx_timeout);



int lance_start_xmit (struct sk_buff *skb, struct net_device *dev)

{
@@ -586,6 +588,7 @@ int lance_start_xmit (struct sk_buff *skb, struct net_device *dev) 


        return 0;

}

EXPORT_SYMBOL_GPL(lance_start_xmit);



/* taken from the depca driver via a2065.c */

static void lance_load_multicast (struct net_device *dev)
@@ -654,6 +657,7 @@ void lance_set_multicast (struct net_device *dev) 
	if (!stopped)

		netif_start_queue (dev);

}

EXPORT_SYMBOL_GPL(lance_set_multicast);



#ifdef CONFIG_NET_POLL_CONTROLLER

void lance_poll(struct net_device *dev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE