Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[pandora-kernel.git] / net / 802 / fc.c

diff --git a/net/802/fc.c b/net/802/fc.c
index 675d9ba..cb3475e 100644 (file)
--- a/net/802/fc.c
+++ b/net/802/fc.c
@@ -35,7 +35,7 @@
 
 static int fc_header(struct sk_buff *skb, struct net_device *dev,
                     unsigned short type,
-                    void *daddr, void *saddr, unsigned len)
+                    const void *daddr, const void *saddr, unsigned len)
 {
        struct fch_hdr *fch;
        int hdr_len;
@@ -95,11 +95,14 @@ static int fc_rebuild_header(struct sk_buff *skb)
 #endif
 }
 
+static const struct header_ops fc_header_ops = {
+       .create  = fc_header,
+       .rebuild = fc_rebuild_header,
+};
+
 static void fc_setup(struct net_device *dev)
 {
-       dev->hard_header        = fc_header;
-       dev->rebuild_header     = fc_rebuild_header;
-
+       dev->header_ops         = &fc_header_ops;
        dev->type               = ARPHRD_IEEE802;
        dev->hard_header_len    = FC_HLEN;
        dev->mtu                = 2024;