tahvo-usb: Fix NULL ptr deref in OTR irq handler

[openwrt.git] / package / ppp / patches / 108-debian_pppatm_fix_mtu.patch

diff --git a/package/ppp/patches/108-debian_pppatm_fix_mtu.patch b/package/ppp/patches/108-debian_pppatm_fix_mtu.patch
index 85daa6a..d8f17ef 100644 (file)
--- a/package/ppp/patches/108-debian_pppatm_fix_mtu.patch
+++ b/package/ppp/patches/108-debian_pppatm_fix_mtu.patch
@@ -1,7 +1,6 @@
-diff -Naur ppp-2.4.4.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.4/pppd/plugins/pppoatm/pppoatm.c
---- ppp-2.4.4.orig/pppd/plugins/pppoatm/pppoatm.c      2009-05-07 16:23:41.000000000 -0400
-+++ ppp-2.4.4/pppd/plugins/pppoatm/pppoatm.c   2009-05-07 16:23:57.000000000 -0400
-@@ -179,8 +179,11 @@
+--- a/pppd/plugins/pppoatm/pppoatm.c
++++ b/pppd/plugins/pppoatm/pppoatm.c
+@@ -179,8 +179,11 @@ static void send_config_pppoa(int mtu,

        int sock;
        struct ifreq ifr;
  
        int sock;
        struct ifreq ifr;
  


@@ -15,38 +14,7 @@ diff -Naur ppp-2.4.4.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.4/pppd/plugins/
  
        sock = socket(AF_INET, SOCK_DGRAM, 0);
        if (sock < 0)
  
        sock = socket(AF_INET, SOCK_DGRAM, 0);
        if (sock < 0)

-@@ -198,8 +201,11 @@
-                             int pcomp,
-                             int accomp)
- {
--      if (mru > pppoatm_max_mru)
--              error("Couldn't increase MRU to %d", mru);
-+      if (pppoatm_max_mru && mru > pppoatm_max_mru) {
-+              warn("Couldn't increase MRU to %d. Using %d",
-+                      mru, pppoatm_max_mru);
-+              mru = pppoatm_max_mru;
-+      }
- }
- 
- void plugin_init(void)
-diff -Naur ppp-2.4.4.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.4/pppd/plugins/pppoatm/pppoatm.c
---- ppp-2.4.4.orig/pppd/plugins/pppoatm/pppoatm.c      2009-05-07 16:23:41.000000000 -0400
-+++ ppp-2.4.4/pppd/plugins/pppoatm/pppoatm.c   2009-05-07 16:23:57.000000000 -0400
-@@ -179,8 +179,11 @@
-       int sock;
-       struct ifreq ifr;
- 
--      if (mtu > pppoatm_max_mtu)
--              error("Couldn't increase MTU to %d", mtu);
-+      if (pppoatm_max_mtu && mtu > pppoatm_max_mtu) {
-+              warn("Couldn't increase MTU to %d. Using %d",
-+                      mtu, pppoatm_max_mtu);
-+              mtu = pppoatm_max_mtu;
-+      }
- 
-       sock = socket(AF_INET, SOCK_DGRAM, 0);
-       if (sock < 0)
-@@ -198,8 +201,11 @@
+@@ -198,8 +201,11 @@ static void recv_config_pppoa(int mru,

                              int pcomp,
                              int accomp)
  {
                              int pcomp,
                              int accomp)
  {