Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Browse files Browse the repository at this point in the history 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (25 commits)
  TIPC: Removed inactive maintainer
  isdn: Cleanup Sections in PCMCIA driver elsa
  isdn: Cleanup Sections in PCMCIA driver avma1
  isdn: Cleanup Sections in PCMCIA driver teles
  isdn: Cleanup Sections in PCMCIA driver sedlbauer
  via-velocity: Fix FLOW_CNTL_TX_RX handling in set_mii_flow_control()
  netfilter: xt_hashlimit: IPV6 bugfix
  netfilter: ip6table_raw: fix table priority
  netfilter: xt_hashlimit: dl_seq_stop() fix
  af_key: return error if pfkey_xfrm_policy2msg_prep() fails
  skbuff: remove unused dma_head & dma_maps fields
  vlan: updates vlan real_num_tx_queues
  vlan: adds vlan_dev_select_queue
  igb: only use vlan_gro_receive if vlans are registered
  igb: do not modify tx_queue_len on link speed change
  igb: count Rx FIFO errors correctly
  bnx2: Use proper handler during netpoll.
  bnx2: Fix netpoll crash.
  ksz884x: fix return value of netdev_set_eeprom
  cgroups: net_cls as module
  ...
  • Loading branch information
Linus Torvalds committed Mar 25, 2010
2 parents 01e7770 + 7c9f757 commit 126a031
Show file tree
Hide file tree
Showing 23 changed files with 166 additions and 169 deletions.
1 change: 0 additions & 1 deletion MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5423,7 +5423,6 @@ S: Maintained
F: sound/soc/codecs/twl4030*

TIPC NETWORK LAYER
M: Per Liden <per.liden@ericsson.com>
M: Jon Maloy <jon.maloy@ericsson.com>
M: Allan Stephens <allan.stephens@windriver.com>
L: tipc-discussion@lists.sourceforge.net
Expand Down
12 changes: 6 additions & 6 deletions drivers/isdn/hisax/avma1_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module_param(isdnprot, int, 0);
handler.
*/

static int avma1cs_config(struct pcmcia_device *link);
static int avma1cs_config(struct pcmcia_device *link) __devinit ;
static void avma1cs_release(struct pcmcia_device *link);

/*
Expand All @@ -59,7 +59,7 @@ static void avma1cs_release(struct pcmcia_device *link);
needed to manage one actual PCMCIA card.
*/

static void avma1cs_detach(struct pcmcia_device *p_dev);
static void avma1cs_detach(struct pcmcia_device *p_dev) __devexit ;


/*
Expand Down Expand Up @@ -99,7 +99,7 @@ typedef struct local_info_t {
======================================================================*/

static int avma1cs_probe(struct pcmcia_device *p_dev)
static int __devinit avma1cs_probe(struct pcmcia_device *p_dev)
{
local_info_t *local;

Expand Down Expand Up @@ -140,7 +140,7 @@ static int avma1cs_probe(struct pcmcia_device *p_dev)
======================================================================*/

static void avma1cs_detach(struct pcmcia_device *link)
static void __devexit avma1cs_detach(struct pcmcia_device *link)
{
dev_dbg(&link->dev, "avma1cs_detach(0x%p)\n", link);
avma1cs_release(link);
Expand Down Expand Up @@ -174,7 +174,7 @@ static int avma1cs_configcheck(struct pcmcia_device *p_dev,
}


static int avma1cs_config(struct pcmcia_device *link)
static int __devinit avma1cs_config(struct pcmcia_device *link)
{
local_info_t *dev;
int i;
Expand Down Expand Up @@ -282,7 +282,7 @@ static struct pcmcia_driver avma1cs_driver = {
.name = "avma1_cs",
},
.probe = avma1cs_probe,
.remove = avma1cs_detach,
.remove = __devexit_p(avma1cs_detach),
.id_table = avma1cs_ids,
};

Expand Down
12 changes: 6 additions & 6 deletions drivers/isdn/hisax/elsa_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ module_param(protocol, int, 0);
handler.
*/

static int elsa_cs_config(struct pcmcia_device *link);
static int elsa_cs_config(struct pcmcia_device *link) __devinit ;
static void elsa_cs_release(struct pcmcia_device *link);

/*
Expand All @@ -85,7 +85,7 @@ static void elsa_cs_release(struct pcmcia_device *link);
needed to manage one actual PCMCIA card.
*/

static void elsa_cs_detach(struct pcmcia_device *p_dev);
static void elsa_cs_detach(struct pcmcia_device *p_dev) __devexit;

/*
A driver needs to provide a dev_node_t structure for each device
Expand Down Expand Up @@ -121,7 +121,7 @@ typedef struct local_info_t {
======================================================================*/

static int elsa_cs_probe(struct pcmcia_device *link)
static int __devinit elsa_cs_probe(struct pcmcia_device *link)
{
local_info_t *local;

Expand Down Expand Up @@ -166,7 +166,7 @@ static int elsa_cs_probe(struct pcmcia_device *link)
======================================================================*/

static void elsa_cs_detach(struct pcmcia_device *link)
static void __devexit elsa_cs_detach(struct pcmcia_device *link)
{
local_info_t *info = link->priv;

Expand Down Expand Up @@ -210,7 +210,7 @@ static int elsa_cs_configcheck(struct pcmcia_device *p_dev,
return -ENODEV;
}

static int elsa_cs_config(struct pcmcia_device *link)
static int __devinit elsa_cs_config(struct pcmcia_device *link)
{
local_info_t *dev;
int i;
Expand Down Expand Up @@ -327,7 +327,7 @@ static struct pcmcia_driver elsa_cs_driver = {
.name = "elsa_cs",
},
.probe = elsa_cs_probe,
.remove = elsa_cs_detach,
.remove = __devexit_p(elsa_cs_detach),
.id_table = elsa_ids,
.suspend = elsa_suspend,
.resume = elsa_resume,
Expand Down
12 changes: 6 additions & 6 deletions drivers/isdn/hisax/sedlbauer_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ module_param(protocol, int, 0);
event handler.
*/

static int sedlbauer_config(struct pcmcia_device *link);
static int sedlbauer_config(struct pcmcia_device *link) __devinit ;
static void sedlbauer_release(struct pcmcia_device *link);

/*
Expand All @@ -85,7 +85,7 @@ static void sedlbauer_release(struct pcmcia_device *link);
needed to manage one actual PCMCIA card.
*/

static void sedlbauer_detach(struct pcmcia_device *p_dev);
static void sedlbauer_detach(struct pcmcia_device *p_dev) __devexit;

/*
You'll also need to prototype all the functions that will actually
Expand Down Expand Up @@ -129,7 +129,7 @@ typedef struct local_info_t {
======================================================================*/

static int sedlbauer_probe(struct pcmcia_device *link)
static int __devinit sedlbauer_probe(struct pcmcia_device *link)
{
local_info_t *local;

Expand Down Expand Up @@ -177,7 +177,7 @@ static int sedlbauer_probe(struct pcmcia_device *link)
======================================================================*/

static void sedlbauer_detach(struct pcmcia_device *link)
static void __devexit sedlbauer_detach(struct pcmcia_device *link)
{
dev_dbg(&link->dev, "sedlbauer_detach(0x%p)\n", link);

Expand Down Expand Up @@ -283,7 +283,7 @@ static int sedlbauer_config_check(struct pcmcia_device *p_dev,



static int sedlbauer_config(struct pcmcia_device *link)
static int __devinit sedlbauer_config(struct pcmcia_device *link)
{
local_info_t *dev = link->priv;
win_req_t *req;
Expand Down Expand Up @@ -441,7 +441,7 @@ static struct pcmcia_driver sedlbauer_driver = {
.name = "sedlbauer_cs",
},
.probe = sedlbauer_probe,
.remove = sedlbauer_detach,
.remove = __devexit_p(sedlbauer_detach),
.id_table = sedlbauer_ids,
.suspend = sedlbauer_suspend,
.resume = sedlbauer_resume,
Expand Down
12 changes: 6 additions & 6 deletions drivers/isdn/hisax/teles_cs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ module_param(protocol, int, 0);
handler.
*/

static int teles_cs_config(struct pcmcia_device *link);
static int teles_cs_config(struct pcmcia_device *link) __devinit ;
static void teles_cs_release(struct pcmcia_device *link);

/*
Expand All @@ -66,7 +66,7 @@ static void teles_cs_release(struct pcmcia_device *link);
needed to manage one actual PCMCIA card.
*/

static void teles_detach(struct pcmcia_device *p_dev);
static void teles_detach(struct pcmcia_device *p_dev) __devexit ;

/*
A linked list of "instances" of the teles_cs device. Each actual
Expand Down Expand Up @@ -112,7 +112,7 @@ typedef struct local_info_t {
======================================================================*/

static int teles_probe(struct pcmcia_device *link)
static int __devinit teles_probe(struct pcmcia_device *link)
{
local_info_t *local;

Expand Down Expand Up @@ -156,7 +156,7 @@ static int teles_probe(struct pcmcia_device *link)
======================================================================*/

static void teles_detach(struct pcmcia_device *link)
static void __devexit teles_detach(struct pcmcia_device *link)
{
local_info_t *info = link->priv;

Expand Down Expand Up @@ -200,7 +200,7 @@ static int teles_cs_configcheck(struct pcmcia_device *p_dev,
return -ENODEV;
}

static int teles_cs_config(struct pcmcia_device *link)
static int __devinit teles_cs_config(struct pcmcia_device *link)
{
local_info_t *dev;
int i;
Expand Down Expand Up @@ -319,7 +319,7 @@ static struct pcmcia_driver teles_cs_driver = {
.name = "teles_cs",
},
.probe = teles_probe,
.remove = teles_detach,
.remove = __devexit_p(teles_detach),
.id_table = teles_ids,
.suspend = teles_suspend,
.resume = teles_resume,
Expand Down
14 changes: 9 additions & 5 deletions drivers/net/bnx2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,8 @@ static const struct flash_spec flash_5709 = {

MODULE_DEVICE_TABLE(pci, bnx2_pci_tbl);

static void bnx2_init_napi(struct bnx2 *bp);

static inline u32 bnx2_tx_avail(struct bnx2 *bp, struct bnx2_tx_ring_info *txr)
{
u32 diff;
Expand Down Expand Up @@ -6197,6 +6199,7 @@ bnx2_open(struct net_device *dev)
bnx2_disable_int(bp);

bnx2_setup_int_mode(bp, disable_msi);
bnx2_init_napi(bp);
bnx2_napi_enable(bp);
rc = bnx2_alloc_mem(bp);
if (rc)
Expand Down Expand Up @@ -7643,9 +7646,11 @@ poll_bnx2(struct net_device *dev)
int i;

for (i = 0; i < bp->irq_nvecs; i++) {
disable_irq(bp->irq_tbl[i].vector);
bnx2_interrupt(bp->irq_tbl[i].vector, &bp->bnx2_napi[i]);
enable_irq(bp->irq_tbl[i].vector);
struct bnx2_irq *irq = &bp->irq_tbl[i];

disable_irq(irq->vector);
irq->handler(irq->vector, &bp->bnx2_napi[i]);
enable_irq(irq->vector);
}
}
#endif
Expand Down Expand Up @@ -8207,7 +8212,7 @@ bnx2_init_napi(struct bnx2 *bp)
{
int i;

for (i = 0; i < BNX2_MAX_MSIX_VEC; i++) {
for (i = 0; i < bp->irq_nvecs; i++) {
struct bnx2_napi *bnapi = &bp->bnx2_napi[i];
int (*poll)(struct napi_struct *, int);

Expand Down Expand Up @@ -8276,7 +8281,6 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
dev->ethtool_ops = &bnx2_ethtool_ops;

bp = netdev_priv(dev);
bnx2_init_napi(bp);

pci_set_drvdata(pdev, dev);

Expand Down
Loading

0 comments on commit 126a031

Please sign in to comment.