diff --git a/[refs] b/[refs] index ef055ba4e26f..aa336f4adfc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8487460720fd03a0f4ecd032f017b0a8468028da +refs/heads/master: 8fde8a076940969d32805b853efdce8b988d7dda diff --git a/trunk/net/core/filter.c b/trunk/net/core/filter.c index 4f8369729a4e..df3744355839 100644 --- a/trunk/net/core/filter.c +++ b/trunk/net/core/filter.c @@ -68,7 +68,6 @@ static inline void *load_pointer(struct sk_buff *skb, int k, * sk_filter - run a packet through a socket filter * @sk: sock associated with &sk_buff * @skb: buffer to filter - * @needlock: set to 1 if the sock is not locked by caller. * * Run the filter code and then cut skb->data to correct size returned by * sk_run_filter. If pkt_len is 0 we toss packet. If skb->len is smaller