Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 214315
b: refs/heads/master
c: c43ced1
h: refs/heads/master
i:
  214313: 23ad306
  214311: 954a6ac
v: v3
  • Loading branch information
Santiago Leon authored and David S. Miller committed Sep 7, 2010
1 parent 1e0241f commit 373f426
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 25 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e295fe83755213fb5991be577485525a7453213c
refs/heads/master: c43ced18a515bef29166f22c01a6d9062aa3008e
44 changes: 20 additions & 24 deletions trunk/drivers/net/ibmveth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,12 @@
printk(KERN_ERR "(%s:%3.3d ua:%x) ERROR: " fmt, __FILE__, __LINE__ , adapter->vdev->unit_address, ## args)

#ifdef DEBUG
#define ibmveth_debug_printk_no_adapter(fmt, args...) \
printk(KERN_DEBUG "(%s:%3.3d): " fmt, __FILE__, __LINE__ , ## args)
#define ibmveth_debug_printk(fmt, args...) \
printk(KERN_DEBUG "(%s:%3.3d ua:%x): " fmt, __FILE__, __LINE__ , adapter->vdev->unit_address, ## args)
#define ibmveth_assert(expr) \
if(!(expr)) { \
printk(KERN_DEBUG "assertion failed (%s:%3.3d ua:%x): %s\n", __FILE__, __LINE__, adapter->vdev->unit_address, #expr); \
BUG(); \
}
#else
#define ibmveth_debug_printk_no_adapter(fmt, args...)
#define ibmveth_debug_printk(fmt, args...)
#define ibmveth_assert(expr)
#endif

Expand Down Expand Up @@ -248,7 +242,8 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, struc
skb = netdev_alloc_skb(adapter->netdev, pool->buff_size);

if(!skb) {
ibmveth_debug_printk("replenish: unable to allocate skb\n");
netdev_dbg(adapter->netdev,
"replenish: unable to allocate skb\n");
adapter->replenish_no_mem++;
break;
}
Expand Down Expand Up @@ -440,7 +435,8 @@ static void ibmveth_rxq_recycle_buffer(struct ibmveth_adapter *adapter)
lpar_rc = h_add_logical_lan_buffer(adapter->vdev->unit_address, desc.desc);

if(lpar_rc != H_SUCCESS) {
ibmveth_debug_printk("h_add_logical_lan_buffer failed during recycle rc=%ld", lpar_rc);
netdev_dbg(adapter->netdev, "h_add_logical_lan_buffer failed "
"during recycle rc=%ld", lpar_rc);
ibmveth_remove_buffer_from_pool(adapter, adapter->rx_queue.queue_addr[adapter->rx_queue.index].correlator);
}

Expand Down Expand Up @@ -551,7 +547,7 @@ static int ibmveth_open(struct net_device *netdev)
int i;
struct device *dev;

ibmveth_debug_printk("open starting\n");
netdev_dbg(netdev, "open starting\n");

napi_enable(&adapter->napi);

Expand Down Expand Up @@ -607,9 +603,9 @@ static int ibmveth_open(struct net_device *netdev)
rxq_desc.fields.flags_len = IBMVETH_BUF_VALID | adapter->rx_queue.queue_len;
rxq_desc.fields.address = adapter->rx_queue.queue_dma;

ibmveth_debug_printk("buffer list @ 0x%p\n", adapter->buffer_list_addr);
ibmveth_debug_printk("filter list @ 0x%p\n", adapter->filter_list_addr);
ibmveth_debug_printk("receive q @ 0x%p\n", adapter->rx_queue.queue_addr);
netdev_dbg(netdev, "buffer list @ 0x%p\n", adapter->buffer_list_addr);
netdev_dbg(netdev, "filter list @ 0x%p\n", adapter->filter_list_addr);
netdev_dbg(netdev, "receive q @ 0x%p\n", adapter->rx_queue.queue_addr);

h_vio_signal(adapter->vdev->unit_address, VIO_IRQ_DISABLE);

Expand Down Expand Up @@ -639,7 +635,7 @@ static int ibmveth_open(struct net_device *netdev)
}
}

ibmveth_debug_printk("registering irq 0x%x\n", netdev->irq);
netdev_dbg(netdev, "registering irq 0x%x\n", netdev->irq);
if((rc = request_irq(netdev->irq, ibmveth_interrupt, 0, netdev->name, netdev)) != 0) {
ibmveth_error_printk("unable to request irq 0x%x, rc %d\n", netdev->irq, rc);
do {
Expand Down Expand Up @@ -669,12 +665,12 @@ static int ibmveth_open(struct net_device *netdev)
return -ENOMEM;
}

ibmveth_debug_printk("initial replenish cycle\n");
netdev_dbg(netdev, "initial replenish cycle\n");
ibmveth_interrupt(netdev->irq, netdev);

netif_start_queue(netdev);

ibmveth_debug_printk("open complete\n");
netdev_dbg(netdev, "open complete\n");

return 0;
}
Expand All @@ -684,7 +680,7 @@ static int ibmveth_close(struct net_device *netdev)
struct ibmveth_adapter *adapter = netdev_priv(netdev);
long lpar_rc;

ibmveth_debug_printk("close starting\n");
netdev_dbg(netdev, "close starting\n");

napi_disable(&adapter->napi);

Expand All @@ -709,7 +705,7 @@ static int ibmveth_close(struct net_device *netdev)

ibmveth_cleanup(adapter);

ibmveth_debug_printk("close complete\n");
netdev_dbg(netdev, "close complete\n");

return 0;
}
Expand Down Expand Up @@ -1109,7 +1105,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
if (!ibmveth_rxq_buffer_valid(adapter)) {
wmb(); /* suggested by larson1 */
adapter->rx_invalid_buffer++;
ibmveth_debug_printk("recycling invalid buffer\n");
netdev_dbg(netdev, "recycling invalid buffer\n");
ibmveth_rxq_recycle_buffer(adapter);
} else {
struct sk_buff *skb, *new_skb;
Expand Down Expand Up @@ -1359,8 +1355,8 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
unsigned int *mcastFilterSize_p;


ibmveth_debug_printk_no_adapter("entering ibmveth_probe for UA 0x%x\n",
dev->unit_address);
dev_dbg(&dev->dev, "entering ibmveth_probe for UA 0x%x\n",
dev->unit_address);

mac_addr_p = (unsigned char *) vio_get_attribute(dev,
VETH_MAC_ADDR, NULL);
Expand Down Expand Up @@ -1429,25 +1425,25 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_
kobject_uevent(kobj, KOBJ_ADD);
}

ibmveth_debug_printk("adapter @ 0x%p\n", adapter);
netdev_dbg(netdev, "adapter @ 0x%p\n", adapter);

adapter->buffer_list_dma = DMA_ERROR_CODE;
adapter->filter_list_dma = DMA_ERROR_CODE;
adapter->rx_queue.queue_dma = DMA_ERROR_CODE;

ibmveth_debug_printk("registering netdev...\n");
netdev_dbg(netdev, "registering netdev...\n");

ibmveth_set_csum_offload(netdev, 1, ibmveth_set_tx_csum_flags);

rc = register_netdev(netdev);

if(rc) {
ibmveth_debug_printk("failed to register netdev rc=%d\n", rc);
netdev_dbg(netdev, "failed to register netdev rc=%d\n", rc);
free_netdev(netdev);
return rc;
}

ibmveth_debug_printk("registered\n");
netdev_dbg(netdev, "registered\n");

return 0;
}
Expand Down

0 comments on commit 373f426

Please sign in to comment.