From b7b8ae6f3c8840df99fef531c4a322ea625ee8c0 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 17 Apr 2013 06:18:27 +0000 Subject: [PATCH] --- yaml --- r: 369276 b: refs/heads/master c: 76f5c6f359a18abd3359ad8523cb23fbf58602b7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/tipc/eth_media.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f6056965545f..248446af5bc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8aeb89f214cdb4c3d9e43213d52d4c5b0fb93bbb +refs/heads/master: 76f5c6f359a18abd3359ad8523cb23fbf58602b7 diff --git a/trunk/net/tipc/eth_media.c b/trunk/net/tipc/eth_media.c index 06488195f998..120a676a3360 100644 --- a/trunk/net/tipc/eth_media.c +++ b/trunk/net/tipc/eth_media.c @@ -111,6 +111,7 @@ static int send_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr, skb_reset_network_header(clone); clone->dev = dev; + clone->protocol = htons(ETH_P_TIPC); dev_hard_header(clone, dev, ETH_P_TIPC, dest->value, dev->dev_addr, clone->len); dev_queue_xmit(clone);