diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-13 16:02:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-13 16:02:38 -0700 |
| commit | 8bf6a33640bc5adfd16886da50dff67e2022242c (patch) | |
| tree | da7e6c8b5c3d4f49faea083b500a9c61f782c77d | |
| parent | 8fb2c885db5efc3afbf6b79e80faa796714bfab4 (diff) | |
| download | stable-queue-8bf6a33640bc5adfd16886da50dff67e2022242c.tar.gz | |
3.0 patches
| -rw-r--r-- | queue-3.0/atm-br2864-sent-packets-truncated-in-vc-routed-mode.patch | 29 | ||||
| -rw-r--r-- | queue-3.0/series | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/queue-3.0/atm-br2864-sent-packets-truncated-in-vc-routed-mode.patch b/queue-3.0/atm-br2864-sent-packets-truncated-in-vc-routed-mode.patch new file mode 100644 index 0000000000..c440ce4d3c --- /dev/null +++ b/queue-3.0/atm-br2864-sent-packets-truncated-in-vc-routed-mode.patch @@ -0,0 +1,29 @@ +From a08af810cdc29d2ca930e8a869d3d01744c392d8 Mon Sep 17 00:00:00 2001 +From: Chas Williams <chas@cmf.nrl.navy.mil> +Date: Mon, 1 Aug 2011 17:56:14 -0700 +Subject: atm: br2864: sent packets truncated in VC routed mode + +From: Chas Williams <chas@cmf.nrl.navy.mil> + +commit a08af810cdc29d2ca930e8a869d3d01744c392d8 upstream. + +Reported-by: Pascal Hambourg <pascal@plouf.fr.eu.org> +Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> +Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + net/atm/br2684.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/net/atm/br2684.c ++++ b/net/atm/br2684.c +@@ -242,8 +242,6 @@ static int br2684_xmit_vcc(struct sk_buf + if (brdev->payload == p_bridged) { + skb_push(skb, 2); + memset(skb->data, 0, 2); +- } else { /* p_routed */ +- skb_pull(skb, ETH_HLEN); + } + } + skb_debug(skb); diff --git a/queue-3.0/series b/queue-3.0/series index bf8abfd1cb..e5f00343c6 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -11,3 +11,4 @@ usb-option-driver-add-pid-for-vodafone-huawei-k3770.patch usb-option-driver-add-pid-for-vodafone-huawei-k3771.patch usb-option-driver-add-pid-for-vodafone-huawei-k4510.patch usb-option-driver-add-pid-for-vodafone-huawei-k4511.patch +atm-br2864-sent-packets-truncated-in-vc-routed-mode.patch |