3 files changed, 7 insertions, 9 deletions

diff --git a/include/linux/filter.h b/include/linux/filter.h
index 91b2e3b9251e..ddfa0372a3b7 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -146,6 +146,7 @@ struct sock;
 
 extern unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen);
 extern int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);
+extern int sk_detach_filter(struct sock *sk);
 extern int sk_chk_filter(struct sock_filter *filter, int flen);
 #endif /* __KERNEL__ */
 
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 39dd83b183a9..452c88d971ad 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -827,7 +827,7 @@ static inline int dev_parse_header(const struct sk_buff *skb,
 {
         const struct net_device *dev = skb->dev;
 
-        if (!dev->header_ops->parse)
+        if (!dev->header_ops || !dev->header_ops->parse)
                 return 0;
         return dev->header_ops->parse(skb, haddr);
 }
diff --git a/include/linux/netfilter/xt_sctp.h b/include/linux/netfilter/xt_sctp.h
index b157897e7792..dd5a4fd4cfd3 100644
--- a/include/linux/netfilter/xt_sctp.h
+++ b/include/linux/netfilter/xt_sctp.h
@@ -7,9 +7,6 @@
 
 #define XT_SCTP_VALID_FLAGS             0x07
 
-#define ELEMCOUNT(x) (sizeof(x)/sizeof(x[0]))
-
-
 struct xt_sctp_flag_info {
         u_int8_t chunktype;
         u_int8_t flag;
@@ -59,21 +56,21 @@ struct xt_sctp_info {
 #define SCTP_CHUNKMAP_RESET(chunkmap)                           \
         do {                                                    \
                 int i;                                          \
-                for (i = 0; i < ELEMCOUNT(chunkmap); i++)       \
+                for (i = 0; i < ARRAY_SIZE(chunkmap); i++)      \
                         chunkmap[i] = 0;                        \
         } while (0)
 
 #define SCTP_CHUNKMAP_SET_ALL(chunkmap)                         \
         do {                                                    \
                 int i;                                          \
-                for (i = 0; i < ELEMCOUNT(chunkmap); i++)       \
+                for (i = 0; i < ARRAY_SIZE(chunkmap); i++)      \
                         chunkmap[i] = ~0;                       \
         } while (0)
 
 #define SCTP_CHUNKMAP_COPY(destmap, srcmap)                     \
         do {                                                    \
                 int i;                                          \
-                for (i = 0; i < ELEMCOUNT(chunkmap); i++)       \
+                for (i = 0; i < ARRAY_SIZE(srcmap); i++)        \
                         destmap[i] = srcmap[i];                 \
         } while (0)
 
@@ -81,7 +78,7 @@ struct xt_sctp_info {
 ({                                                      \
         int i;                                          \
         int flag = 1;                                   \
-        for (i = 0; i < ELEMCOUNT(chunkmap); i++) {     \
+        for (i = 0; i < ARRAY_SIZE(chunkmap); i++) {    \
                 if (chunkmap[i]) {                      \
                         flag = 0;                       \
                         break;                          \
@@ -94,7 +91,7 @@ struct xt_sctp_info {
 ({                                                      \
         int i;                                          \
         int flag = 1;                                   \
-        for (i = 0; i < ELEMCOUNT(chunkmap); i++) {     \
+        for (i = 0; i < ARRAY_SIZE(chunkmap); i++) {    \
                 if (chunkmap[i] != ~0) {                \
                         flag = 0;                       \
                                 break;                  \