Changeset 31758


Ignore:
Timestamp:
2012-05-16T17:23:12+02:00 (6 years ago)
Author:
nbd
Message:

iproute2: update to 3.3.0, drop a few useless old patches, add codel support

Location:
trunk/package/iproute2
Files:
4 added
4 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/iproute2/Makefile

    r31311 r31758  
    99 
    1010PKG_NAME:=iproute2 
    11 PKG_VERSION:=3.2.0 
    12 PKG_RELEASE:=2 
     11PKG_VERSION:=3.3.0 
     12PKG_RELEASE:=1 
    1313 
    14 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     14PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ 
    16 PKG_MD5SUM:=d58f388b670e0c1b2cd81eb65d5ac626 
     16PKG_MD5SUM:=308e7145218dd552c2766fe527e239e1 
    1717PKG_BUILD_PARALLEL:=1 
    1818 
     
    7070 
    7171define Build/Compile 
    72         $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/netem \ 
    73                 HOSTCC="$(HOSTCC)"  EXTRA_CCOPTS="$(TARGET_CFLAGS)" \ 
    74                 CFLAGS="-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall \ 
    75                 -I../include -DRESOLVE_HOSTNAMES" 
    76         $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) all 
    77         $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/tc $(MAKE_FLAGS) tc 
    78         $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/ip $(MAKE_FLAGS) ip 
    79         $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/misc $(MAKE_FLAGS) ss 
     72        $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)  
    8073endef 
    8174 
  • trunk/package/iproute2/patches/002-iproute2-ipxfrm_no_sctp.patch

    r24216 r31758  
    55--- a/ip/ipxfrm.c 
    66+++ b/ip/ipxfrm.c 
    7 @@ -467,7 +467,6 @@ void xfrm_selector_print(struct xfrm_sel 
     7@@ -468,7 +468,6 @@ void xfrm_selector_print(struct xfrm_sel 
    88        switch (sel->proto) { 
    99        case IPPROTO_TCP: 
     
    1313        default: /* XXX */ 
    1414                if (sel->sport_mask) 
    15 @@ -1172,7 +1171,6 @@ static int xfrm_selector_upspec_parse(st 
     15@@ -1263,7 +1262,6 @@ static int xfrm_selector_upspec_parse(st 
    1616                switch (sel->proto) { 
    1717                case IPPROTO_TCP: 
  • trunk/package/iproute2/patches/006-iproute2-tc_esfq.patch

    r24216 r31758  
    55 3 files changed, 260 insertions(+) 
    66 
    7 --- a/include/linux/pkt_sched.h 
    8 +++ b/include/linux/pkt_sched.h 
    9 @@ -174,8 +174,38 @@ struct tc_sfq_qopt 
    10   * 
    11   *     The only reason for this is efficiency, it is possible 
    12   *     to change these parameters in compile time. 
    13 + * 
    14 + *     If you need to play with these values use esfq instead. 
    15   */ 
    16   
    17 +/* ESFQ section */ 
    18 + 
    19 +enum 
    20 +{ 
    21 +       /* traditional */ 
    22 +       TCA_SFQ_HASH_CLASSIC, 
    23 +       TCA_SFQ_HASH_DST, 
    24 +       TCA_SFQ_HASH_SRC, 
    25 +       /* conntrack */ 
    26 +       TCA_SFQ_HASH_CTORIGDST, 
    27 +       TCA_SFQ_HASH_CTORIGSRC, 
    28 +       TCA_SFQ_HASH_CTREPLDST, 
    29 +       TCA_SFQ_HASH_CTREPLSRC, 
    30 +       TCA_SFQ_HASH_CTNATCHG, 
    31 +}; 
    32 + 
    33 +struct tc_esfq_qopt 
    34 +{ 
    35 +       unsigned        quantum;        /* Bytes per round allocated to flow */ 
    36 +       int             perturb_period; /* Period of hash perturbation */ 
    37 +       __u32           limit;          /* Maximal packets in queue */ 
    38 +       unsigned        divisor;        /* Hash divisor  */ 
    39 +       unsigned        flows;          /* Maximal number of flows  */ 
    40 +       unsigned        hash_kind;      /* Hash function to use for flow identification */ 
    41 +}; 
    42 + 
    43 + 
    44 + 
    45  /* RED section */ 
    46   
    47  enum 
    48 @@ -579,8 +609,37 @@ struct tc_sfq_xstats { 
    49   * 
    50   *     The only reason for this is efficiency, it is possible 
    51   *     to change these parameters in compile time. 
    52 + * 
    53 + *     If you need to play with these values use esfq instead. 
    54   */ 
    55   
    56 +/* ESFQ section */ 
    57 + 
    58 +enum 
    59 +{ 
    60 +       /* traditional */ 
    61 +       TCA_SFQ_HASH_CLASSIC, 
    62 +       TCA_SFQ_HASH_DST, 
    63 +       TCA_SFQ_HASH_SRC, 
    64 +       /* conntrack */ 
    65 +       TCA_SFQ_HASH_CTORIGDST, 
    66 +       TCA_SFQ_HASH_CTORIGSRC, 
    67 +       TCA_SFQ_HASH_CTREPLDST, 
    68 +       TCA_SFQ_HASH_CTREPLSRC, 
    69 +       TCA_SFQ_HASH_CTNATCHG, 
    70 +}; 
    71 + 
    72 +struct tc_esfq_qopt 
    73 +{ 
    74 +       unsigned        quantum;        /* Bytes per round allocated to flow */ 
    75 +       int             perturb_period; /* Period of hash perturbation */ 
    76 +       __u32           limit;          /* Maximal packets in queue */ 
    77 +       unsigned        divisor;        /* Hash divisor  */ 
    78 +       unsigned        flows;          /* Maximal number of flows  */ 
    79 +       unsigned        hash_kind;      /* Hash function to use for flow identification */ 
    80 +}; 
    81 + 
    82 + 
    83  /* RED section */ 
    84   
    85  enum { 
    867--- a/tc/Makefile 
    878+++ b/tc/Makefile 
  • trunk/package/iproute2/patches/200-act_connmark.patch

    r28378 r31758  
    11--- a/tc/Makefile 
    22+++ b/tc/Makefile 
    3 @@ -36,6 +36,7 @@ TCMODULES += m_mirred.o 
     3@@ -38,6 +38,7 @@ TCMODULES += m_mirred.o 
    44 TCMODULES += m_nat.o 
    55 TCMODULES += m_pedit.o 
Note: See TracChangeset for help on using the changeset viewer.