diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-15 20:25:48 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-25 00:19:03 -0400 |
commit | cfbe40630745f2e9d4a51250e87a766c9a2907c2 (patch) | |
tree | af53575e1d78651aca17880a939707007965a24c | |
parent | 374e29da7c2b86cfc4986a06f0923bdc861c2111 (diff) |
ehea: Call dev_consume_skb_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_consume_skb_any in functions that can
be called in hard irq and other contexts.
None of the locations was a packet drop so dev_kfree_skb_any is
inappropriate.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 7628e0fd8455..538903bf13bc 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c | |||
@@ -490,7 +490,7 @@ static int ehea_refill_rq_def(struct ehea_port_res *pr, | |||
490 | skb_arr[index] = skb; | 490 | skb_arr[index] = skb; |
491 | tmp_addr = ehea_map_vaddr(skb->data); | 491 | tmp_addr = ehea_map_vaddr(skb->data); |
492 | if (tmp_addr == -1) { | 492 | if (tmp_addr == -1) { |
493 | dev_kfree_skb(skb); | 493 | dev_consume_skb_any(skb); |
494 | q_skba->os_skbs = fill_wqes - i; | 494 | q_skba->os_skbs = fill_wqes - i; |
495 | ret = 0; | 495 | ret = 0; |
496 | break; | 496 | break; |
@@ -856,7 +856,7 @@ static struct ehea_cqe *ehea_proc_cqes(struct ehea_port_res *pr, int my_quota) | |||
856 | 856 | ||
857 | index = EHEA_BMASK_GET(EHEA_WR_ID_INDEX, cqe->wr_id); | 857 | index = EHEA_BMASK_GET(EHEA_WR_ID_INDEX, cqe->wr_id); |
858 | skb = pr->sq_skba.arr[index]; | 858 | skb = pr->sq_skba.arr[index]; |
859 | dev_kfree_skb(skb); | 859 | dev_consume_skb_any(skb); |
860 | pr->sq_skba.arr[index] = NULL; | 860 | pr->sq_skba.arr[index] = NULL; |
861 | } | 861 | } |
862 | 862 | ||
@@ -2044,7 +2044,7 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev, | |||
2044 | skb_copy_bits(skb, 0, imm_data, skb->len); | 2044 | skb_copy_bits(skb, 0, imm_data, skb->len); |
2045 | 2045 | ||
2046 | swqe->immediate_data_length = skb->len; | 2046 | swqe->immediate_data_length = skb->len; |
2047 | dev_kfree_skb(skb); | 2047 | dev_consume_skb_any(skb); |
2048 | } | 2048 | } |
2049 | 2049 | ||
2050 | static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev) | 2050 | static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev) |