diff options
| author | John Fastabend <john.r.fastabend@intel.com> | 2009-12-23 22:02:57 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-23 22:02:57 -0800 |
| commit | f466dba1832f05006cf6caa9be41fb98d11cb848 (patch) | |
| tree | d6bd5846aed13f269f3e6e1406b1a26abebc5bcd /net | |
| parent | c0d7a0212becebe11ffe6979ee3d6f1c4104568d (diff) | |
| download | op-kernel-dev-f466dba1832f05006cf6caa9be41fb98d11cb848.zip op-kernel-dev-f466dba1832f05006cf6caa9be41fb98d11cb848.tar.gz | |
pktgen: ndo_start_xmit can return NET_XMIT_xxx values
This updates pktgen so that it does not decrement skb->users
when it receives valid NET_XMIT_xxx values. These are now
valid return values from ndo_start_xmit in net-next-2.6.
They also indicate the skb has been consumed.
This fixes pktgen to work correctly with vlan devices.
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/pktgen.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index a23b45f..de0c2c7 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -250,8 +250,7 @@ struct pktgen_dev { __u64 count; /* Default No packets to send */ __u64 sofar; /* How many pkts we've sent so far */ __u64 tx_bytes; /* How many bytes we've transmitted */ - __u64 errors; /* Errors when trying to transmit, - pkts will be re-sent */ + __u64 errors; /* Errors when trying to transmit, */ /* runtime counters relating to clone_skb */ @@ -3465,6 +3464,12 @@ static void pktgen_xmit(struct pktgen_dev *pkt_dev) pkt_dev->seq_num++; pkt_dev->tx_bytes += pkt_dev->last_pkt_size; break; + case NET_XMIT_DROP: + case NET_XMIT_CN: + case NET_XMIT_POLICED: + /* skb has been consumed */ + pkt_dev->errors++; + break; default: /* Drivers are not supposed to return other values! */ if (net_ratelimit()) pr_info("pktgen: %s xmit error: %d\n", |
