X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=net%2Fbridge%2Fbr_private.h;h=c11b554fd109d4f1b587c8b254a5352889a29b86;hb=c21d1e7f53ffd9c0f162c42e7fde07d1c45fa127;hp=e6dc6f52990d1946d083ea7a254453a244b7306c;hpb=c2f828977ba5d17c13debba374ea252d18e5ccfb;p=linux-2.6-omap-h63xx.git

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index e6dc6f52990..c11b554fd10 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -124,7 +124,7 @@ struct net_bridge
 	struct timer_list		tcn_timer;
 	struct timer_list		topology_change_timer;
 	struct timer_list		gc_timer;
-	struct kobject			ifobj;
+	struct kobject			*ifobj;
 };
 
 extern struct notifier_block br_device_notifier;
@@ -192,7 +192,7 @@ extern struct sk_buff *br_handle_frame(struct net_bridge_port *p,
 
 /* br_ioctl.c */
 extern int br_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-extern int br_ioctl_deviceless_stub(unsigned int cmd, void __user *arg);
+extern int br_ioctl_deviceless_stub(struct net *net, unsigned int cmd, void __user *arg);
 
 /* br_netfilter.c */
 #ifdef CONFIG_BRIDGE_NETFILTER