refresh 2.6.30 patches

[openwrt-10.03/.git] / target / linux / generic-2.6 / patches-2.6.30 / 150-netfilter_imq.patch

diff --git a/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch
index 3bd7a8fbb619511b8eb9231b4fb26da0202d726a..b4f2f4b5612471cba8e1c56cc95d169e4316d45f 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch
@@ -798,7 +798,7 @@
  
  #ifdef CONFIG_NET_DMA
        dma_cookie_t            dma_cookie;
-@@ -423,6 +435,12 @@ extern void skb_dma_unmap(struct device 
+@@ -423,6 +435,12 @@ extern void skb_dma_unmap(struct device
                          enum dma_data_direction dir);
  #endif
  
@@ -847,7 +847,7 @@
                        dev_queue_xmit_nit(skb, dev);
  
                if (netif_needs_gso(dev, skb)) {
-@@ -1749,8 +1756,7 @@ u16 skb_tx_hash(const struct net_device 
+@@ -1749,8 +1756,7 @@ u16 skb_tx_hash(const struct net_device
  }
  EXPORT_SYMBOL(skb_tx_hash);
  
@@ -1107,7 +1107,7 @@
  /* return EBUSY when somebody else is registered, return EEXIST if the
   * same handler is registered, return 0 in case of success. */
  int nf_register_queue_handler(u_int8_t pf, const struct nf_queue_handler *qh)
-@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const 
+@@ -80,7 +100,7 @@ void nf_unregister_queue_handlers(const
  }
  EXPORT_SYMBOL_GPL(nf_unregister_queue_handlers);