aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.38/280-solos_dont_null_deref.patch
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2011-02-23 23:44:59 +0000
committerMichael Büsch <mb@bu3sch.de>2011-02-23 23:44:59 +0000
commitcdf7ee759ec569c562f7f916935086c3cef46533 (patch)
treebaf4fa8e5bcaaf51811b5a8d0450dfe2803bf093 /target/linux/generic/patches-2.6.38/280-solos_dont_null_deref.patch
parent610af758c1c0fe6a38a1fc8ee91dc95f1bb90b51 (diff)
downloadupstream-cdf7ee759ec569c562f7f916935086c3cef46533.tar.gz
upstream-cdf7ee759ec569c562f7f916935086c3cef46533.tar.bz2
upstream-cdf7ee759ec569c562f7f916935086c3cef46533.zip
2.6.38: Remove patches that are upstream in -rc6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25680 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.38/280-solos_dont_null_deref.patch')
-rw-r--r--target/linux/generic/patches-2.6.38/280-solos_dont_null_deref.patch14
1 files changed, 0 insertions, 14 deletions
diff --git a/target/linux/generic/patches-2.6.38/280-solos_dont_null_deref.patch b/target/linux/generic/patches-2.6.38/280-solos_dont_null_deref.patch
deleted file mode 100644
index 13595725ca..0000000000
--- a/target/linux/generic/patches-2.6.38/280-solos_dont_null_deref.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/drivers/atm/solos-pci.c
-+++ b/drivers/atm/solos-pci.c
-@@ -866,8 +866,9 @@ static int popen(struct atm_vcc *vcc)
- }
-
- skb = alloc_skb(sizeof(*header), GFP_ATOMIC);
-- if (!skb && net_ratelimit()) {
-- dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n");
-+ if (!skb) {
-+ if (net_ratelimit())
-+ dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n");
- return -ENOMEM;
- }
- header = (void *)skb_put(skb, sizeof(*header));