aboutsummaryrefslogtreecommitdiffstats
path: root/package/ppp/patches/105-debian_pppoatm_cleanup.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-06-04 11:25:53 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-06-04 11:25:53 +0000
commit91142205534e135a29ceb3992708bf2ca3219021 (patch)
tree16e69db35c7fdf48ea76876109b0b38845361209 /package/ppp/patches/105-debian_pppoatm_cleanup.patch
parentd5b15895ef66b9a664afa72d88507060e1f0a270 (diff)
downloadupstream-91142205534e135a29ceb3992708bf2ca3219021.tar.gz
upstream-91142205534e135a29ceb3992708bf2ca3219021.tar.bz2
upstream-91142205534e135a29ceb3992708bf2ca3219021.zip
refresh all package patches in the buildroot using quilt
SVN-Revision: 7490
Diffstat (limited to 'package/ppp/patches/105-debian_pppoatm_cleanup.patch')
-rw-r--r--package/ppp/patches/105-debian_pppoatm_cleanup.patch21
1 files changed, 11 insertions, 10 deletions
diff --git a/package/ppp/patches/105-debian_pppoatm_cleanup.patch b/package/ppp/patches/105-debian_pppoatm_cleanup.patch
index 2437a12003..80f4445888 100644
--- a/package/ppp/patches/105-debian_pppoatm_cleanup.patch
+++ b/package/ppp/patches/105-debian_pppoatm_cleanup.patch
@@ -1,7 +1,8 @@
-diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c
---- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c 2005-03-22 14:44:18.000000000 +0100
-+++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c 2005-03-22 14:44:02.000000000 +0100
-@@ -70,18 +70,20 @@ static int setdevname_pppoatm(const char
+Index: ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c 2007-06-04 13:22:08.348586104 +0200
++++ ppp-2.4.3/pppd/plugins/pppoatm/pppoatm.c 2007-06-04 13:22:10.825209600 +0200
+@@ -70,18 +70,20 @@
{
struct sockaddr_atmpvc addr;
extern struct stat devstat;
@@ -28,7 +29,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
memcpy(&pvcaddr, &addr, sizeof pvcaddr);
strlcpy(devnam, cp, sizeof devnam);
devstat.st_mode = S_IFSOCK;
-@@ -93,7 +95,6 @@ static int setdevname_pppoatm(const char
+@@ -93,7 +95,6 @@
lcp_allowoptions[0].neg_asyncmap = 0;
lcp_wantoptions[0].neg_pcompression = 0;
}
@@ -36,7 +37,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
device_got_set = 1;
return 1;
}
-@@ -108,6 +109,7 @@ static void no_device_given_pppoatm(void
+@@ -108,6 +109,7 @@
static void set_line_discipline_pppoatm(int fd)
{
struct atm_backend_ppp be;
@@ -44,7 +45,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
be.backend_num = ATM_BACKEND_PPP;
if (!llc_encaps)
be.encaps = PPPOATM_ENCAPS_VC;
-@@ -115,6 +117,7 @@ static void set_line_discipline_pppoatm(
+@@ -115,6 +117,7 @@
be.encaps = PPPOATM_ENCAPS_LLC;
else
be.encaps = PPPOATM_ENCAPS_AUTODETECT;
@@ -52,7 +53,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
if (ioctl(fd, ATM_SETBACKEND, &be) < 0)
fatal("ioctl(ATM_SETBACKEND): %m");
}
-@@ -179,16 +182,19 @@ static void send_config_pppoa(int mtu,
+@@ -175,16 +178,19 @@
{
int sock;
struct ifreq ifr;
@@ -73,7 +74,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
}
static void recv_config_pppoa(int mru,
-@@ -202,7 +208,7 @@ static void recv_config_pppoa(int mru,
+@@ -198,7 +204,7 @@
void plugin_init(void)
{
@@ -82,7 +83,7 @@ diff -ruNp ppp-2.4.3.orig/pppd/plugins/pppoatm/pppoatm.c ppp-2.4.3/pppd/plugins/
extern int new_style_driver; /* From sys-linux.c */
if (!ppp_available() && !new_style_driver)
fatal("Kernel doesn't support ppp_generic - "
-@@ -210,9 +216,9 @@ void plugin_init(void)
+@@ -206,9 +212,9 @@
#else
fatal("No PPPoATM support on this OS");
#endif