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

Commit e128c5e2 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: (34 commits)
  virtio_net: Add schedule check to napi_enable call
  x25: Do not reference freed memory.
  pch_can: fix tseg1/tseg2 setting issue
  isdn: hysdn: Kill (partially buggy) CVS regision log reporting.
  can: softing_cs needs slab.h
  pch_gbe: Fix the issue which a driver locks when rx offload is set by ethtool
  netfilter: nf_conntrack: set conntrack templates again if we return NF_REPEAT
  pch_can: fix module reload issue with MSI
  pch_can: fix rmmod issue
  pch_can: fix 800k comms issue
  net: Fix lockdep regression caused by initializing netdev queues too early.
  net/caif: Fix dangling list pointer in freed object on error.
  USB CDC NCM errata updates for cdc_ncm host driver
  CDC NCM errata updates for cdc.h
  ixgbe: update version string
  ixgbe: cleanup variable initialization
  ixgbe: limit VF access to network traffic
  ixgbe: fix for 82599 erratum on Header Splitting
  ixgbe: fix variable set but not used warnings by gcc 4.6
  e1000: add support for Marvell Alaska M88E1118R PHY
  ...
parents 70a06228 3e9d08ec

drivers/isdn/hysdn/hysdn_defs.h

+0 −2
Original line number Diff line number Diff line
@@ -227,7 +227,6 @@ extern hysdn_card *card_root; /* pointer to first card */ 
/*************************/

/* im/exported functions */

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

extern char *hysdn_getrev(const char *);



/* hysdn_procconf.c */

extern int hysdn_procconf_init(void);	/* init proc config filesys */
@@ -259,7 +258,6 @@ extern int hysdn_tx_cfgline(hysdn_card *, unsigned char *, 


/* hysdn_net.c */

extern unsigned int hynet_enable; 

extern char *hysdn_net_revision;

extern int hysdn_net_create(hysdn_card *);	/* create a new net device */

extern int hysdn_net_release(hysdn_card *);	/* delete the device */

extern char *hysdn_net_getname(hysdn_card *);	/* get name of net interface */

drivers/isdn/hysdn/hysdn_init.c

+1 −25
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ MODULE_DESCRIPTION("ISDN4Linux: Driver for HYSDN cards"); 
MODULE_AUTHOR("Werner Cornelius");

MODULE_LICENSE("GPL");



static char *hysdn_init_revision = "$Revision: 1.6.6.6 $";

static int cardmax;		/* number of found cards */

hysdn_card *card_root = NULL;	/* pointer to first card */

static hysdn_card *card_last = NULL;	/* pointer to first card */
@@ -49,25 +48,6 @@ static hysdn_card *card_last = NULL; /* pointer to first card */ 
/* Additionally newer versions may be activated without rebooting.          */

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



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

/* extract revision number from string for log output */

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

char *

hysdn_getrev(const char *revision)

{

	char *rev;

	char *p;



	if ((p = strchr(revision, ':'))) {

		rev = p + 2;

		p = strchr(rev, '$');

		*--p = 0;

	} else

		rev = "???";

	return rev;

}





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

/* init_module is called once when the module is loaded to do all necessary */

/* things like autodetect...                                                */
@@ -175,13 +155,9 @@ static int hysdn_have_procfs; 
static int __init

hysdn_init(void)

{

	char tmp[50];

	int rc;



	strcpy(tmp, hysdn_init_revision);

	printk(KERN_NOTICE "HYSDN: module Rev: %s loaded\n", hysdn_getrev(tmp));

	strcpy(tmp, hysdn_net_revision);

	printk(KERN_NOTICE "HYSDN: network interface Rev: %s \n", hysdn_getrev(tmp));

	printk(KERN_NOTICE "HYSDN: module loaded\n");



	rc = pci_register_driver(&hysdn_pci_driver);

	if (rc)

drivers/isdn/hysdn/hysdn_net.c

+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ 
unsigned int hynet_enable = 0xffffffff; 

module_param(hynet_enable, uint, 0);



/* store the actual version for log reporting */

char *hysdn_net_revision = "$Revision: 1.8.6.4 $";



#define MAX_SKB_BUFFERS 20	/* number of buffers for keeping TX-data */



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

drivers/isdn/hysdn/hysdn_procconf.c

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "hysdn_defs.h"



static DEFINE_MUTEX(hysdn_conf_mutex);

static char *hysdn_procconf_revision = "$Revision: 1.8.6.4 $";



#define INFO_OUT_LEN 80		/* length of info line including lf */
@@ -404,7 +403,7 @@ hysdn_procconf_init(void) 
		card = card->next;	/* next entry */

	}



	printk(KERN_NOTICE "HYSDN: procfs Rev. %s initialised\n", hysdn_getrev(hysdn_procconf_revision));

	printk(KERN_NOTICE "HYSDN: procfs initialised\n");

	return (0);

}				/* hysdn_procconf_init */

drivers/net/benet/be_cmds.c

+5 −0
Original line number Diff line number Diff line
@@ -1786,6 +1786,10 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter, 
	spin_lock_bh(&adapter->mcc_lock);



	wrb = wrb_from_mccq(adapter);

	if (!wrb) {

		status = -EBUSY;

		goto err;

	}

	req = nonemb_cmd->va;

	sge = nonembedded_sgl(wrb);
@@ -1801,6 +1805,7 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter, 


	status = be_mcc_notify_wait(adapter);



err:

	spin_unlock_bh(&adapter->mcc_lock);

	return status;

}