Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-block.git] / net / x25 / x25_dev.c

diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c
index 94fd12f3a9095852fb2ebdec2c3d80964b6ffd4a..3ff206c0ae945759e1e38fd4b287fb966a0354e1 100644 (file)
--- a/net/x25/x25_dev.c
+++ b/net/x25/x25_dev.c
@@ -48,7 +48,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb)
        if ((sk = x25_find_socket(lci, nb)) != NULL) {
                int queued = 1;
 
-               skb->h.raw = skb->data;
+               skb_reset_transport_header(skb);
                bh_lock_sock(sk);
                if (!sock_owned_by_user(sk)) {
                        queued = x25_process_rx_frame(sk, skb);
@@ -95,6 +95,9 @@ int x25_lapb_receive_frame(struct sk_buff *skb, struct net_device *dev,
        struct sk_buff *nskb;
        struct x25_neigh *nb;
 
+       if (dev_net(dev) != &init_net)
+               goto drop;
+
        nskb = skb_copy(skb, GFP_ATOMIC);
        if (!nskb)
                goto drop;