Merge branch 'master' of malu.beraldoleal.com:netsfs

Conflicts: proto.c
beraldoleal · Feb 17, 2013 · e605389 · e605389
2 parents ff7fac0 + 5968881
commit e605389
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/proto.c b/proto.c
@@ -82,7 +82,6 @@ int netsfs_packet_handler(struct sk_buff *skb, struct net_device *dev, struct pa
     if (!netsfsinfo) {
         err = -ENOMEM;
         goto free;
-    }
 
     netsfsinfo->x = 10;
     INIT_WORK(&netsfsinfo->my_work, netsfs_go);