Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[linux-2.6-omap-h63xx.git] / include / net / llc_sap.h

diff --git a/include/net/llc_sap.h b/include/net/llc_sap.h
index 6dd4cdccca42e3de5824ac63b2f2c7552e202a10..2c56dbece7291ba1398dc5c5ce02ec3504e8f075 100644 (file)
--- a/include/net/llc_sap.h
+++ b/include/net/llc_sap.h
@@ -12,12 +12,15 @@
  * See the GNU General Public License for more details.
  */
 struct llc_sap;
-struct sk_buff;
 struct net_device;
+struct sk_buff;
+struct sock;
 
 extern void llc_sap_rtn_pdu(struct llc_sap *sap, struct sk_buff *skb);
-extern void llc_save_primitive(struct sk_buff* skb, unsigned char prim);
-extern struct sk_buff *llc_alloc_frame(struct net_device *dev);
+extern void llc_save_primitive(struct sock *sk, struct sk_buff* skb,
+                              unsigned char prim);
+extern struct sk_buff *llc_alloc_frame(struct sock *sk,
+                                      struct net_device *dev);
 
 extern void llc_build_and_send_test_pkt(struct llc_sap *sap,
                                        struct sk_buff *skb,