Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / net / bareudp.c

diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c
index 88e7900..3b6664c 100644 (file)
--- a/drivers/net/bareudp.c
+++ b/drivers/net/bareudp.c
@@ -125,7 +125,6 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
                bareudp->dev->stats.rx_dropped++;
                goto drop;
        }
-
        tun_dst = udp_tun_rx_dst(skb, family, TUNNEL_KEY, 0, 0);
        if (!tun_dst) {
                bareudp->dev->stats.rx_dropped++;
@@ -627,6 +626,7 @@ static int bareudp_configure(struct net *net, struct net_device *dev,
        bareudp->ethertype = conf->ethertype;
        bareudp->sport_min = conf->sport_min;
        bareudp->multi_proto_mode = conf->multi_proto_mode;
+
        err = register_netdevice(dev);
        if (err)
                return err;