diff options
Diffstat (limited to 'net/core/pktgen.c')
| -rw-r--r-- | net/core/pktgen.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index f76079cd750c..e35a6fbb8110 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c | |||
| @@ -1070,7 +1070,9 @@ static ssize_t pktgen_if_write(struct file *file, | |||
| 1070 | len = num_arg(&user_buffer[i], 10, &value); | 1070 | len = num_arg(&user_buffer[i], 10, &value); |
| 1071 | if (len < 0) | 1071 | if (len < 0) |
| 1072 | return len; | 1072 | return len; |
| 1073 | 1073 | if ((value > 0) && | |
| 1074 | (!(pkt_dev->odev->priv_flags & IFF_TX_SKB_SHARING))) | ||
| 1075 | return -ENOTSUPP; | ||
| 1074 | i += len; | 1076 | i += len; |
| 1075 | pkt_dev->clone_skb = value; | 1077 | pkt_dev->clone_skb = value; |
| 1076 | 1078 | ||
| @@ -3555,7 +3557,6 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname) | |||
| 3555 | pkt_dev->min_pkt_size = ETH_ZLEN; | 3557 | pkt_dev->min_pkt_size = ETH_ZLEN; |
| 3556 | pkt_dev->max_pkt_size = ETH_ZLEN; | 3558 | pkt_dev->max_pkt_size = ETH_ZLEN; |
| 3557 | pkt_dev->nfrags = 0; | 3559 | pkt_dev->nfrags = 0; |
| 3558 | pkt_dev->clone_skb = pg_clone_skb_d; | ||
| 3559 | pkt_dev->delay = pg_delay_d; | 3560 | pkt_dev->delay = pg_delay_d; |
| 3560 | pkt_dev->count = pg_count_d; | 3561 | pkt_dev->count = pg_count_d; |
| 3561 | pkt_dev->sofar = 0; | 3562 | pkt_dev->sofar = 0; |
| @@ -3563,7 +3564,6 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname) | |||
| 3563 | pkt_dev->udp_src_max = 9; | 3564 | pkt_dev->udp_src_max = 9; |
| 3564 | pkt_dev->udp_dst_min = 9; | 3565 | pkt_dev->udp_dst_min = 9; |
| 3565 | pkt_dev->udp_dst_max = 9; | 3566 | pkt_dev->udp_dst_max = 9; |
| 3566 | |||
| 3567 | pkt_dev->vlan_p = 0; | 3567 | pkt_dev->vlan_p = 0; |
| 3568 | pkt_dev->vlan_cfi = 0; | 3568 | pkt_dev->vlan_cfi = 0; |
| 3569 | pkt_dev->vlan_id = 0xffff; | 3569 | pkt_dev->vlan_id = 0xffff; |
| @@ -3575,6 +3575,8 @@ static int pktgen_add_device(struct pktgen_thread *t, const char *ifname) | |||
| 3575 | err = pktgen_setup_dev(pkt_dev, ifname); | 3575 | err = pktgen_setup_dev(pkt_dev, ifname); |
| 3576 | if (err) | 3576 | if (err) |
| 3577 | goto out1; | 3577 | goto out1; |
| 3578 | if (pkt_dev->odev->priv_flags & IFF_TX_SKB_SHARING) | ||
| 3579 | pkt_dev->clone_skb = pg_clone_skb_d; | ||
| 3578 | 3580 | ||
| 3579 | pkt_dev->entry = proc_create_data(ifname, 0600, pg_proc_dir, | 3581 | pkt_dev->entry = proc_create_data(ifname, 0600, pg_proc_dir, |
| 3580 | &pktgen_if_fops, pkt_dev); | 3582 | &pktgen_if_fops, pkt_dev); |
