1 files changed, 4 insertions, 4 deletions

diff --git a/net/tipc/eth_media.c b/net/tipc/eth_media.c
index 9be4839e32c5..67bb29b44d1b 100644
--- a/net/tipc/eth_media.c
+++ b/net/tipc/eth_media.c
@@ -73,7 +73,7 @@ static int send_msg(struct sk_buff *buf, struct tipc_bearer *tb_ptr,
 
         clone = skb_clone(buf, GFP_ATOMIC);
         if (clone) {
-                clone->nh.raw = clone->data;
+                skb_reset_network_header(clone);
                 dev = ((struct eth_bearer *)(tb_ptr->usr_handle))->dev;
                 clone->dev = dev;
                 dev->hard_header(clone, dev, ETH_P_TIPC,
@@ -99,8 +99,8 @@ static int recv_msg(struct sk_buff *buf, struct net_device *dev,
 
         if (likely(eb_ptr->bearer)) {
                if (likely(!dev->promiscuity) ||
-                   !memcmp(buf->mac.raw,dev->dev_addr,ETH_ALEN) ||
-                   !memcmp(buf->mac.raw,dev->broadcast,ETH_ALEN)) {
+                   !memcmp(skb_mac_header(buf), dev->dev_addr, ETH_ALEN) ||
+                   !memcmp(skb_mac_header(buf), dev->broadcast, ETH_ALEN)) {
                         size = msg_size((struct tipc_msg *)buf->data);
                         skb_trim(buf, size);
                         if (likely(buf->len == size)) {
@@ -140,7 +140,7 @@ static int enable_bearer(struct tipc_bearer *tb_ptr)
                 return -EDQUOT;
         if (!eb_ptr->dev) {
                 eb_ptr->dev = dev;
-                eb_ptr->tipc_packet_type.type = __constant_htons(ETH_P_TIPC);
+                eb_ptr->tipc_packet_type.type = htons(ETH_P_TIPC);
                 eb_ptr->tipc_packet_type.dev = dev;
                 eb_ptr->tipc_packet_type.func = recv_msg;
                 eb_ptr->tipc_packet_type.af_packet_priv = eb_ptr;