diff options
author | Joe Perches <joe@perches.com> | 2013-03-08 10:03:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-09 16:09:19 -0500 |
commit | 720a43efd30f04a0a492c85fb997361c44fbae05 (patch) | |
tree | 430e9488e00413655b7947f67e82c4fd2c07e951 /drivers/net/ethernet/qlogic/qlge/qlge_main.c | |
parent | e8f83e5ec7450b85b101a774e165e70a18e9c3ab (diff) |
drivers:net: Remove unnecessary OOM messages after netdev_alloc_skb
Emitting netdev_alloc_skb and netdev_alloc_skb_ip_align OOM
messages is unnecessary as there is already a dump_stack
after allocation failures.
Other trivial changes around these removals:
Convert a few comparisons of pointer to 0 to !pointer.
Change flow to remove unnecessary label.
Remove now unused variable.
Hoist assignment from if.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlge/qlge_main.c')
-rw-r--r-- | drivers/net/ethernet/qlogic/qlge/qlge_main.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c index b13ab544a7eb..1dd778a6f01e 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c | |||
@@ -1211,8 +1211,6 @@ static void ql_update_sbq(struct ql_adapter *qdev, struct rx_ring *rx_ring) | |||
1211 | netdev_alloc_skb(qdev->ndev, | 1211 | netdev_alloc_skb(qdev->ndev, |
1212 | SMALL_BUFFER_SIZE); | 1212 | SMALL_BUFFER_SIZE); |
1213 | if (sbq_desc->p.skb == NULL) { | 1213 | if (sbq_desc->p.skb == NULL) { |
1214 | netif_err(qdev, probe, qdev->ndev, | ||
1215 | "Couldn't get an skb.\n"); | ||
1216 | rx_ring->sbq_clean_idx = clean_idx; | 1214 | rx_ring->sbq_clean_idx = clean_idx; |
1217 | return; | 1215 | return; |
1218 | } | 1216 | } |
@@ -1519,8 +1517,6 @@ static void ql_process_mac_rx_page(struct ql_adapter *qdev, | |||
1519 | 1517 | ||
1520 | skb = netdev_alloc_skb(ndev, length); | 1518 | skb = netdev_alloc_skb(ndev, length); |
1521 | if (!skb) { | 1519 | if (!skb) { |
1522 | netif_err(qdev, drv, qdev->ndev, | ||
1523 | "Couldn't get an skb, need to unwind!.\n"); | ||
1524 | rx_ring->rx_dropped++; | 1520 | rx_ring->rx_dropped++; |
1525 | put_page(lbq_desc->p.pg_chunk.page); | 1521 | put_page(lbq_desc->p.pg_chunk.page); |
1526 | return; | 1522 | return; |
@@ -1605,8 +1601,6 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev, | |||
1605 | /* Allocate new_skb and copy */ | 1601 | /* Allocate new_skb and copy */ |
1606 | new_skb = netdev_alloc_skb(qdev->ndev, length + NET_IP_ALIGN); | 1602 | new_skb = netdev_alloc_skb(qdev->ndev, length + NET_IP_ALIGN); |
1607 | if (new_skb == NULL) { | 1603 | if (new_skb == NULL) { |
1608 | netif_err(qdev, probe, qdev->ndev, | ||
1609 | "No skb available, drop the packet.\n"); | ||
1610 | rx_ring->rx_dropped++; | 1604 | rx_ring->rx_dropped++; |
1611 | return; | 1605 | return; |
1612 | } | 1606 | } |