← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to net/ipv6/netfilter/ip6_queue.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/ipv6/netfilter/ip6_queue.c
204
204
        else
205
205
                pmsg->outdev_name[0] = '\0';
206
206
 
207
 
        if (entry->indev && entry->skb->dev) {
 
207
        if (entry->indev && entry->skb->dev &&
 
208
            entry->skb->mac_header != entry->skb->network_header) {
208
209
                pmsg->hw_type = entry->skb->dev->type;
209
210
                pmsg->hw_addrlen = dev_parse_header(entry->skb, pmsg->hw_addr);
210
211
        }
403
404
static inline void
404
405
__ipq_rcv_skb(struct sk_buff *skb)
405
406
{
406
 
        int status, type, pid, flags, nlmsglen, skblen;
 
407
        int status, type, pid, flags;
 
408
        unsigned int nlmsglen, skblen;
407
409
        struct nlmsghdr *nlh;
408
410
 
409
411
        skblen = skb->len;