7 files changed, 7 insertions, 7 deletions

diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c
index 9c2e7a758f21..adeece11e596 100644
--- a/arch/um/drivers/daemon_kern.c
+++ b/arch/um/drivers/daemon_kern.c
@@ -46,7 +46,7 @@ static int daemon_read(int fd, struct sk_buff **skb,
 {
         *skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
         if(*skb == NULL) return(-ENOMEM);
-        return(net_recvfrom(fd, (*skb)->mac.raw, 
+        return(net_recvfrom(fd, skb_mac_header(*skb),
                             (*skb)->dev->mtu + ETH_HEADER_OTHER));
 }
 
diff --git a/arch/um/drivers/mcast_kern.c b/arch/um/drivers/mcast_kern.c
index 52ccb7b53cd2..e6b8e0dd72a8 100644
--- a/arch/um/drivers/mcast_kern.c
+++ b/arch/um/drivers/mcast_kern.c
@@ -50,7 +50,7 @@ static int mcast_read(int fd, struct sk_buff **skb, struct uml_net_private *lp)
 {
         *skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
         if(*skb == NULL) return(-ENOMEM);
-        return(net_recvfrom(fd, (*skb)->mac.raw, 
+        return(net_recvfrom(fd, skb_mac_header(*skb),
                             (*skb)->dev->mtu + ETH_HEADER_OTHER));
 }
 
diff --git a/arch/um/drivers/pcap_kern.c b/arch/um/drivers/pcap_kern.c
index e67362acf0e7..948849343ca4 100644
--- a/arch/um/drivers/pcap_kern.c
+++ b/arch/um/drivers/pcap_kern.c
@@ -36,7 +36,7 @@ static int pcap_read(int fd, struct sk_buff **skb,
 {
         *skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
         if(*skb == NULL) return(-ENOMEM);
-        return(pcap_user_read(fd, (*skb)->mac.raw, 
+        return(pcap_user_read(fd, skb_mac_header(*skb),
                               (*skb)->dev->mtu + ETH_HEADER_OTHER,
                               (struct pcap_data *) &lp->user));
 }
diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c
index 25634bd1f585..125c44f77638 100644
--- a/arch/um/drivers/slip_kern.c
+++ b/arch/um/drivers/slip_kern.c
@@ -49,7 +49,7 @@ static unsigned short slip_protocol(struct sk_buff *skbuff)
 static int slip_read(int fd, struct sk_buff **skb, 
                        struct uml_net_private *lp)
 {
-        return(slip_user_read(fd, (*skb)->mac.raw, (*skb)->dev->mtu, 
+        return(slip_user_read(fd, skb_mac_header(*skb), (*skb)->dev->mtu,
                               (struct slip_data *) &lp->user));
 }
 
diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
index b3ed8fb874ab..0a0324a6d290 100644
--- a/arch/um/drivers/slirp_kern.c
+++ b/arch/um/drivers/slirp_kern.c
@@ -53,7 +53,7 @@ static unsigned short slirp_protocol(struct sk_buff *skbuff)
 static int slirp_read(int fd, struct sk_buff **skb, 
                        struct uml_net_private *lp)
 {
-        return(slirp_user_read(fd, (*skb)->mac.raw, (*skb)->dev->mtu, 
+        return(slirp_user_read(fd, skb_mac_header(*skb), (*skb)->dev->mtu,
                               (struct slirp_data *) &lp->user));
 }
 
diff --git a/arch/um/os-Linux/drivers/ethertap_kern.c b/arch/um/os-Linux/drivers/ethertap_kern.c
index 70541821775f..12689141414d 100644
--- a/arch/um/os-Linux/drivers/ethertap_kern.c
+++ b/arch/um/os-Linux/drivers/ethertap_kern.c
@@ -43,7 +43,7 @@ static int etap_read(int fd, struct sk_buff **skb, struct uml_net_private *lp)
 
         *skb = ether_adjust_skb(*skb, ETH_HEADER_ETHERTAP);
         if(*skb == NULL) return(-ENOMEM);
-        len = net_recvfrom(fd, (*skb)->mac.raw, 
+        len = net_recvfrom(fd, skb_mac_header(*skb),
                            (*skb)->dev->mtu + 2 * ETH_HEADER_ETHERTAP);
         if(len <= 0) return(len);
         skb_pull(*skb, 2);
diff --git a/arch/um/os-Linux/drivers/tuntap_kern.c b/arch/um/os-Linux/drivers/tuntap_kern.c
index 76570a2c25c3..f1714e7fb1d0 100644
--- a/arch/um/os-Linux/drivers/tuntap_kern.c
+++ b/arch/um/os-Linux/drivers/tuntap_kern.c
@@ -43,7 +43,7 @@ static int tuntap_read(int fd, struct sk_buff **skb,
 {
         *skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
         if(*skb == NULL) return(-ENOMEM);
-        return(net_read(fd, (*skb)->mac.raw, 
+        return(net_read(fd, skb_mac_header(*skb),
                         (*skb)->dev->mtu + ETH_HEADER_OTHER));
 }