← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to net/appletalk/ddp.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/appletalk/ddp.c
63
63
#include <net/tcp_states.h>
64
64
#include <net/route.h>
65
65
#include <linux/atalk.h>
66
 
#include "../core/kmap_skb.h"
 
66
#include <linux/highmem.h>
67
67
 
68
68
struct datalink_proto *ddp_dl, *aarp_dl;
69
69
static const struct proto_ops atalk_dgram_ops;
960
960
 
961
961
                        if (copy > len)
962
962
                                copy = len;
963
 
                        vaddr = kmap_skb_frag(frag);
 
963
                        vaddr = kmap_atomic(skb_frag_page(frag));
964
964
                        sum = atalk_sum_partial(vaddr + frag->page_offset +
965
965
                                                  offset - start, copy, sum);
966
 
                        kunmap_skb_frag(vaddr);
 
966
                        kunmap_atomic(vaddr);
967
967
 
968
968
                        if (!(len -= copy))
969
969
                                return sum;
1208
1208
        if (addr->sat_addr.s_node == ATADDR_BCAST &&
1209
1209
            !sock_flag(sk, SOCK_BROADCAST)) {
1210
1210
#if 1
1211
 
                printk(KERN_WARNING "%s is broken and did not set "
1212
 
                                    "SO_BROADCAST. It will break when 2.2 is "
1213
 
                                    "released.\n",
 
1211
                pr_warn("atalk_connect: %s is broken and did not set SO_BROADCAST.\n",
1214
1212
                        current->comm);
1215
1213
#else
1216
1214
                return -EACCES;