Messages in this thread Patch in this message | | | From | "Kris Katterjohn" <> | Subject | [PATCH] Merge __load_pointer() and load_pointer() in net/core/filter.c; kernel 2.6.14 | Date | Wed, 2 Nov 2005 00:41:15 -0800 |
| |
Another patch for net/core/filter.c by me. I merged __load_pointer() into load_pointer(). I don't see a point in having two seperate functions when both functions are really small and load_pointer() calls __load_pointer(). Renamed the variable "k" to "offset" since that's what it is, and in skb_header_pointer() it's "offset".
This patch is a diff from kernel 2.6.14
Thanks
Signed-off-by: Kris Katterjohn <kjak@users.sourceforge.net>
---
--- x/net/core/filter.c 2005-10-27 19:02:08.000000000 -0500 +++ y/net/core/filter.c 2005-11-02 02:05:40.000000000 -0600 @@ -13,6 +13,8 @@ * 2 of the License, or (at your option) any later version. * * Andi Kleen - Fix a few bad bugs and races. + * Kris Katterjohn - Merged __load_pointer() into load_pointer() and + * cleaned it up a little bit - 2005-11-01 */ #include <linux/module.h> @@ -35,31 +37,27 @@ #include <asm/uaccess.h> #include <linux/filter.h> -/* No hurry in this branch */ -static void *__load_pointer(struct sk_buff *skb, int k) +static inline void *load_pointer(struct sk_buff *skb, int offset, + unsigned int size, void *buffer) { u8 *ptr = NULL; - if (k >= SKF_NET_OFF) - ptr = skb->nh.raw + k - SKF_NET_OFF; - else if (k >= SKF_LL_OFF) - ptr = skb->mac.raw + k - SKF_LL_OFF; + if (offset >= 0) + return skb_header_pointer(skb, offset, size, buffer); + + if (offset >= SKF_AD_OFF) + return NULL; + + if (offset >= SKF_NET_OFF) + ptr = skb->nh.raw + offset - SKF_NET_OFF; + + else if (offset >= SKF_LL_OFF) + ptr = skb->mac.raw + offset - SKF_LL_OFF; if (ptr >= skb->head && ptr < skb->tail) return ptr; - return NULL; -} -static inline void *load_pointer(struct sk_buff *skb, int k, - unsigned int size, void *buffer) -{ - if (k >= 0) - return skb_header_pointer(skb, k, size, buffer); - else { - if (k >= SKF_AD_OFF) - return NULL; - return __load_pointer(skb, k); - } + return NULL; } /**
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |