From: Ben Pfaff Date: Mon, 24 Jan 2011 17:41:29 +0000 (-0800) Subject: dpif-netdev: Allow for Ethernet and VLAN header in buffer size calculation. X-Git-Tag: v1.1.0~456 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ecf9ebff6c0a68d53d600f20ae978aaa96da765f;p=sliver-openvswitch.git dpif-netdev: Allow for Ethernet and VLAN header in buffer size calculation. This is a long-standing bug--it was present in version 1.0 too. Reported-by: Gaetano Catalli Solution by Jesse Gross --- diff --git a/AUTHORS b/AUTHORS index 6abd7ea0a..c48479fc2 100644 --- a/AUTHORS +++ b/AUTHORS @@ -48,6 +48,7 @@ Cedric Hobbs cedric@nicira.com Dave Walker DaveWalker@ubuntu.com Derek Cormier derek.cormier@lab.ntt.co.jp DK Moon dkmoon@nicira.com +Gaetano Catalli gaetano.catalli@gmail.com Ghanem Bahri bahri.ghanem@gmail.com Hector Oron hector.oron@gmail.com Henrik Amren henrik@nicira.com diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 82d7d7413..391a2a7ae 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -950,7 +950,7 @@ dp_netdev_run(void) struct shash_node *node; struct ofpbuf packet; - ofpbuf_init(&packet, DP_NETDEV_HEADROOM + max_mtu); + ofpbuf_init(&packet, DP_NETDEV_HEADROOM + VLAN_ETH_HEADER_LEN + max_mtu); SHASH_FOR_EACH (node, &dp_netdevs) { struct dp_netdev *dp = node->data; struct dp_netdev_port *port;