package/openswan/linux-2.6.20-openswan-2.4.7.kernel-2.6-nfmark-rename.patch

   1 diff -rdup linux-2.6.20.oorig/include/openswan/ipsec_sa.h linux-2.6.20/include/openswan/ipsec_sa.h
   2 --- linux-2.6.20.oorig/include/openswan/ipsec_sa.h      2007-02-15 12:30:41.000000000 +0100
   3 +++ linux-2.6.20/include/openswan/ipsec_sa.h    2007-02-15 13:32:07.000000000 +0100
   4 @@ -99,10 +99,10 @@ typedef unsigned short int IPsecRefTable
   5  #define IPSEC_SA_REF_SUBTABLE_NUM_ENTRIES (1 << IPSEC_SA_REF_SUBTABLE_IDX_WIDTH)
   6
   7  #ifdef CONFIG_NETFILTER
   8 -#define IPSEC_SA_REF_HOST_FIELD(x) ((struct sk_buff*)(x))->nfmark
   9 +#define IPSEC_SA_REF_HOST_FIELD(x) ((struct sk_buff*)(x))->mark
  10  #define IPSEC_SA_REF_HOST_FIELD_TYPE typeof(IPSEC_SA_REF_HOST_FIELD(NULL))
  11  #else /* CONFIG_NETFILTER */
  12 -/* just make it work for now, it doesn't matter, since there is no nfmark */
  13 +/* just make it work for now, it doesn't matter, since there is no mark */
  14  #define IPSEC_SA_REF_HOST_FIELD_TYPE unsigned long
  15  #endif /* CONFIG_NETFILTER */
  16  #define IPSEC_SA_REF_HOST_FIELD_WIDTH (8 * sizeof(IPSEC_SA_REF_HOST_FIELD_TYPE))
  17 diff -rdup linux-2.6.20.oorig/net/ipsec/ipsec_rcv.c linux-2.6.20/net/ipsec/ipsec_rcv.c
  18 --- linux-2.6.20.oorig/net/ipsec/ipsec_rcv.c    2007-02-15 12:30:41.000000000 +0100
  19 +++ linux-2.6.20/net/ipsec/ipsec_rcv.c  2007-02-15 13:33:32.000000000 +0100
  20 @@ -748,13 +748,13 @@ ipsec_rcv_decap_once(struct ipsec_rcv_st
  21
  22  #ifdef CONFIG_NETFILTER
  23         if(proto == IPPROTO_ESP || proto == IPPROTO_AH) {
  24 -               skb->nfmark = (skb->nfmark & (~(IPsecSAref2NFmark(IPSEC_SA_REF_MASK))))
  25 +               skb->mark = (skb->mark & (~(IPsecSAref2NFmark(IPSEC_SA_REF_MASK))))
  26                         | IPsecSAref2NFmark(IPsecSA2SAref(irs->ipsp));
  27                 KLIPS_PRINT(debug_rcv & DB_RX_PKTRX,
  28                             "klips_debug:ipsec_rcv: "
  29 -                           "%s SA sets skb->nfmark=0x%x.\n",
  30 +                           "%s SA sets skb->mark=0x%x.\n",
  31                             proto == IPPROTO_ESP ? "ESP" : "AH",
  32 -                           (unsigned)skb->nfmark);
  33 +                           (unsigned)skb->mark);
  34         }
  35  #endif /* CONFIG_NETFILTER */
  36
  37 @@ -1102,12 +1102,12 @@ int ipsec_rcv_decap(struct ipsec_rcv_sta
  38                         goto rcvleave;
  39                 }
  40  #ifdef CONFIG_NETFILTER
  41 -               skb->nfmark = (skb->nfmark & (~(IPsecSAref2NFmark(IPSEC_SA_REF_TABLE_MASK))))
  42 +               skb->mark = (skb->mark & (~(IPsecSAref2NFmark(IPSEC_SA_REF_TABLE_MASK))))
  43                         | IPsecSAref2NFmark(IPsecSA2SAref(ipsp));
  44                 KLIPS_PRINT(debug_rcv & DB_RX_PKTRX,
  45                             "klips_debug:ipsec_rcv: "
  46 -                           "IPIP SA sets skb->nfmark=0x%x.\n",
  47 -                           (unsigned)skb->nfmark);
  48 +                           "IPIP SA sets skb->mark=0x%x.\n",
  49 +                           (unsigned)skb->mark);
  50  #endif /* CONFIG_NETFILTER */
  51         }
  52