* [PATCH net 1/2] macvtap: fix the missing ret value of TUNSETQUEUE
@ 2013-07-16 5:36 Jason Wang
2013-07-16 5:36 ` [PATCH net 2/2] macvtap: do not assume 802.1Q when send vlan packets Jason Wang
2013-07-16 20:03 ` [PATCH net 1/2] macvtap: fix the missing ret value of TUNSETQUEUE David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Jason Wang @ 2013-07-16 5:36 UTC (permalink / raw)
To: davem, mst, netdev, linux-kernel; +Cc: Jason Wang, Vlad Yasevich
Commit 441ac0fcaadc76ad09771812382345001dd2b813
(macvtap: Convert to using rtnl lock) forget to return what
macvtap_ioctl_set_queue() returns to its caller. This may break multiqueue API
by always falling through to TUNGETFEATURES.
Cc: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/macvtap.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index f2c4a3b..8270b5e 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -1103,6 +1103,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
rtnl_lock();
ret = macvtap_ioctl_set_queue(file, u);
rtnl_unlock();
+ return ret;
case TUNGETFEATURES:
if (put_user(IFF_TAP | IFF_NO_PI | IFF_VNET_HDR |
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net 2/2] macvtap: do not assume 802.1Q when send vlan packets
2013-07-16 5:36 [PATCH net 1/2] macvtap: fix the missing ret value of TUNSETQUEUE Jason Wang
@ 2013-07-16 5:36 ` Jason Wang
2013-07-16 20:03 ` David Miller
2013-07-16 20:03 ` [PATCH net 1/2] macvtap: fix the missing ret value of TUNSETQUEUE David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Jason Wang @ 2013-07-16 5:36 UTC (permalink / raw)
To: davem, mst, netdev, linux-kernel; +Cc: Jason Wang, Basil Gor
The hard-coded 8021.q proto will break 802.1ad traffic. So switch to use
vlan->proto.
Cc: Basil Gor <basil.gor@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/macvtap.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 8270b5e..638b64c 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -869,7 +869,7 @@ static ssize_t macvtap_put_user(struct macvtap_queue *q,
__be16 h_vlan_proto;
__be16 h_vlan_TCI;
} veth;
- veth.h_vlan_proto = htons(ETH_P_8021Q);
+ veth.h_vlan_proto = skb->vlan_proto;
veth.h_vlan_TCI = htons(vlan_tx_tag_get(skb));
vlan_offset = offsetof(struct vlan_ethhdr, h_vlan_proto);
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net 1/2] macvtap: fix the missing ret value of TUNSETQUEUE
2013-07-16 5:36 [PATCH net 1/2] macvtap: fix the missing ret value of TUNSETQUEUE Jason Wang
2013-07-16 5:36 ` [PATCH net 2/2] macvtap: do not assume 802.1Q when send vlan packets Jason Wang
@ 2013-07-16 20:03 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2013-07-16 20:03 UTC (permalink / raw)
To: jasowang; +Cc: mst, netdev, linux-kernel, vyasevic
From: Jason Wang <jasowang@redhat.com>
Date: Tue, 16 Jul 2013 13:36:33 +0800
> Commit 441ac0fcaadc76ad09771812382345001dd2b813
> (macvtap: Convert to using rtnl lock) forget to return what
> macvtap_ioctl_set_queue() returns to its caller. This may break multiqueue API
> by always falling through to TUNGETFEATURES.
>
> Cc: Vlad Yasevich <vyasevic@redhat.com>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net 2/2] macvtap: do not assume 802.1Q when send vlan packets
2013-07-16 5:36 ` [PATCH net 2/2] macvtap: do not assume 802.1Q when send vlan packets Jason Wang
@ 2013-07-16 20:03 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2013-07-16 20:03 UTC (permalink / raw)
To: jasowang; +Cc: mst, netdev, linux-kernel, basil.gor
From: Jason Wang <jasowang@redhat.com>
Date: Tue, 16 Jul 2013 13:36:34 +0800
> The hard-coded 8021.q proto will break 802.1ad traffic. So switch to use
> vlan->proto.
>
> Cc: Basil Gor <basil.gor@gmail.com>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-07-16 20:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-16 5:36 [PATCH net 1/2] macvtap: fix the missing ret value of TUNSETQUEUE Jason Wang
2013-07-16 5:36 ` [PATCH net 2/2] macvtap: do not assume 802.1Q when send vlan packets Jason Wang
2013-07-16 20:03 ` David Miller
2013-07-16 20:03 ` [PATCH net 1/2] macvtap: fix the missing ret value of TUNSETQUEUE David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).